r20791 - in /packages/unstable/mutter/debian/patches: 90_autotools.patch 99_ltmain_as-needed.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Sun Jul 26 11:24:25 UTC 2009
Author: kov
Date: Sun Jul 26 11:24:24 2009
New Revision: 20791
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20791
Log:
Refreshed 90_autotools.patch and 99_ltmain_as-needed.patch
Modified:
packages/unstable/mutter/debian/patches/90_autotools.patch
packages/unstable/mutter/debian/patches/99_ltmain_as-needed.patch
Modified: packages/unstable/mutter/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mutter/debian/patches/90_autotools.patch?rev=20791&op=diff
==============================================================================
--- packages/unstable/mutter/debian/patches/90_autotools.patch [utf-8] (original)
+++ packages/unstable/mutter/debian/patches/90_autotools.patch [utf-8] Sun Jul 26 11:24:24 2009
@@ -6,175 +6,13 @@
autoconf
rm -rf config.h.in~ autom4te.cache/
-Index: metacity-2.26.0/INSTALL
+Index: mutter-2.27.1/INSTALL
===================================================================
---- metacity-2.26.0.orig/INSTALL 2009-06-10 21:51:15.665907142 +0200
-+++ metacity-2.26.0/INSTALL 2009-06-10 21:50:29.897908971 +0200
-@@ -2,15 +2,15 @@ Installation Instructions
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007 Free Software Foundation, Inc.
-+2006, 2007, 2008 Free Software Foundation, Inc.
-
--This file is free documentation; the Free Software Foundation gives
-+ This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-
- Basic Installation
- ==================
-
--Briefly, the shell commands `./configure; make; make install' should
-+ Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
- instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
- Compilers and Options
- =====================
-
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@ is an example:
- Compiling For Multiple Architectures
- ====================================
-
--You can compile the package for more than one kind of computer at the
-+ You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
- installed the package for one architecture, use `make distclean' before
- reconfiguring for another architecture.
-
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
- Installation Names
- ==================
-
--By default, `make install' installs the package's commands under
-+ By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
- Optional Features
- =================
-
--Some packages pay attention to `--enable-FEATURE' options to
-+ Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +152,36 @@ find the X include and library files aut
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
- Specifying the System Type
- ==========================
-
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option. TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
-
-@@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'.
- Sharing Defaults
- ================
-
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists. Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +218,7 @@ A warning: not all `configure' scripts l
- Defining Variables
- ==================
-
--Variables not defined in a site shell script can be set in the
-+ Variables not defined in a site shell script can be set in the
- environment passed to `configure'. However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed
- `configure' Invocation
- ======================
-
--`configure' recognizes the following options to control how it operates.
-+ `configure' recognizes the following options to control how it
-+operates.
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+--- mutter-2.27.1.orig/INSTALL 2009-07-10 20:07:09.000000000 +0200
++++ mutter-2.27.1/INSTALL 2009-07-26 13:22:49.553793337 +0200
+@@ -286,6 +286,16 @@
+ Run the configure checks, but stop before creating any output
+ files.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
@@ -189,501 +27,563 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-Index: metacity-2.26.0/Makefile.in
+Index: mutter-2.27.1/Makefile.in
===================================================================
---- metacity-2.26.0.orig/Makefile.in 2009-06-10 21:51:15.473406137 +0200
-+++ metacity-2.26.0/Makefile.in 2009-06-10 21:50:29.969906183 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/Makefile.in 2009-07-17 00:02:02.000000000 +0200
++++ mutter-2.27.1/Makefile.in 2009-07-26 13:23:04.021790811 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -123,29 +123,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -249,6 +230,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src po doc
-@@ -318,7 +300,7 @@ clean-libtool:
- -rm -rf .libs _libs
-
- distclean-libtool:
-- -rm -f libtool
-+ -rm -f libtool config.lt
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -395,7 +377,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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,9 +15,8 @@
+ @SET_MAKE@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -48,7 +46,6 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -60,9 +57,6 @@
+ ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+- distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -70,34 +64,9 @@
+ 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)"; }; }
+-am__relativize = \
+- dir0=`pwd`; \
+- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+- sed_rest='s,^[^/]*/*,,'; \
+- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+- sed_butlast='s,/*[^/]*$$,,'; \
+- while test -n "$$dir1"; do \
+- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+- if test "$$first" != "."; then \
+- if test "$$first" = ".."; then \
+- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+- else \
+- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+- if test "$$first2" = "$$first"; then \
+- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+- else \
+- dir2="../$$dir2"; \
+- fi; \
+- dir0="$$dir0"/"$$first"; \
+- fi; \
+- fi; \
+- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+- done; \
+- reldir="$$dir2"
++ { test ! -d $(distdir) \
++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr $(distdir); }; }
+ GZIP_ENV = --best
+ DIST_ARCHIVES = $(distdir).tar.bz2
+ distuninstallcheck_listfiles = find . -type f -print
+@@ -297,15 +266,15 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
++ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -321,10 +290,9 @@
+ $(SHELL) ./config.status --recheck
+
+ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+- $(am__cd) $(srcdir) && $(AUTOCONF)
++ cd $(srcdir) && $(AUTOCONF)
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-$(am__aclocal_m4_deps):
++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+@@ -336,7 +304,7 @@
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
++ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+
+@@ -376,7 +344,7 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+@@ -410,16 +378,16 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -434,7 +402,7 @@
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- set x; \
++ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+@@ -446,7 +414,7 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+@@ -455,41 +423,36 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
++ $(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=; \
+ 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; nonemtpy = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-Index: metacity-2.26.0/aclocal.m4
+- test -z "$(CTAGS_ARGS)$$unique" \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
++ $$tags $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- test -d "$(distdir)" || mkdir "$(distdir)"
++ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -505,54 +468,38 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+- $(am__relativize); \
+- new_distdir=$$reldir; \
+- dir1=$$subdir; dir2="$(top_distdir)"; \
+- $(am__relativize); \
+- new_top_distdir=$$reldir; \
+- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+- ($(am__cd) $$subdir && \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$new_top_distdir" \
+- distdir="$$new_distdir" \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+- am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+- -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ -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 $(install_sh) -c -m a+r {} {} \; \
+- || chmod -R a+r "$(distdir)"
++ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+@@ -564,10 +511,6 @@
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+-dist-xz: distdir
+- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+- $(am__remove_distdir)
+-
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -596,8 +539,6 @@
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+- *.tar.xz*) \
+- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+@@ -609,11 +550,9 @@
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+- test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+- && am__cwd=`pwd` \
+- && $(am__cd) $(distdir)/_build \
++ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+@@ -635,15 +574,13 @@
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+- && cd "$$am__cwd" \
+- || exit 1
++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @(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:
+- @$(am__cd) '$(distuninstallcheck_dir)' \
++ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+@@ -685,7 +622,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
+@@ -707,8 +643,6 @@
+
+ html: html-recursive
+
+-html-am:
+-
+ info: info-recursive
+
+ info-am:
+@@ -717,28 +651,18 @@
+
+ install-dvi: install-dvi-recursive
+
+-install-dvi-am:
+-
+ install-exec-am:
+
+ install-html: install-html-recursive
+
+-install-html-am:
+-
+ install-info: install-info-recursive
+
+-install-info-am:
+-
+ install-man:
+
+ install-pdf: install-pdf-recursive
+
+-install-pdf-am:
+-
+ install-ps: install-ps-recursive
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -761,25 +685,24 @@
+
+ uninstall-am:
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+- ctags-recursive install-am install-strip tags-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz 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-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
+-
++ dist-gzip 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-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
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: mutter-2.27.1/aclocal.m4
===================================================================
---- metacity-2.26.0.orig/aclocal.m4 2009-06-10 21:51:16.093413645 +0200
-+++ metacity-2.26.0/aclocal.m4 2009-06-10 21:50:18.561908874 +0200
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+--- mutter-2.27.1.orig/aclocal.m4 2009-07-17 00:01:56.000000000 +0200
++++ mutter-2.27.1/aclocal.m4 2009-07-26 13:23:00.025823856 +0200
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
-
- 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(m4_defn([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.
+-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++# 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.
+@@ -19,6 +19,51 @@
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'.])])
-@@ -55,10 +55,11 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
- AC_ARG_ENABLE(schemas-install,
-- [ --disable-schemas-install Disable the schemas installation],
+
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
+ AC_HELP_STRING([--disable-schemas-install],
+ [Disable the schemas installation]),
- [case ${enableval} in
- yes|no) ;;
-- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ [case ${enableval} in
++ yes|no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
- ])
-@@ -534,7 +535,8 @@ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[t
- # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
- #
- AC_DEFUN([GNOME_DOC_INIT],
--[
-+[AC_REQUIRE([AC_PROG_LN_S])dnl
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
+
- ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
- PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-@@ -603,25 +605,25 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
--AC_SUBST(INTLTOOL_DESKTOP_RULE)
--AC_SUBST(INTLTOOL_DIRECTORY_RULE)
--AC_SUBST(INTLTOOL_KEYS_RULE)
--AC_SUBST(INTLTOOL_PROP_RULE)
--AC_SUBST(INTLTOOL_OAF_RULE)
--AC_SUBST(INTLTOOL_PONG_RULE)
--AC_SUBST(INTLTOOL_SERVER_RULE)
--AC_SUBST(INTLTOOL_SHEET_RULE)
--AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
--AC_SUBST(INTLTOOL_UI_RULE)
--AC_SUBST(INTLTOOL_XAM_RULE)
--AC_SUBST(INTLTOOL_KBD_RULE)
--AC_SUBST(INTLTOOL_XML_RULE)
--AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
--AC_SUBST(INTLTOOL_CAVES_RULE)
--AC_SUBST(INTLTOOL_SCHEMAS_RULE)
--AC_SUBST(INTLTOOL_THEME_RULE)
--AC_SUBST(INTLTOOL_SERVICE_RULE)
--AC_SUBST(INTLTOOL_POLICY_RULE)
-+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-+_IT_SUBST(INTLTOOL_KEYS_RULE)
-+_IT_SUBST(INTLTOOL_PROP_RULE)
-+_IT_SUBST(INTLTOOL_OAF_RULE)
-+_IT_SUBST(INTLTOOL_PONG_RULE)
-+_IT_SUBST(INTLTOOL_SERVER_RULE)
-+_IT_SUBST(INTLTOOL_SHEET_RULE)
-+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+_IT_SUBST(INTLTOOL_UI_RULE)
-+_IT_SUBST(INTLTOOL_XAM_RULE)
-+_IT_SUBST(INTLTOOL_KBD_RULE)
-+_IT_SUBST(INTLTOOL_XML_RULE)
-+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+_IT_SUBST(INTLTOOL_CAVES_RULE)
-+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-+_IT_SUBST(INTLTOOL_THEME_RULE)
-+_IT_SUBST(INTLTOOL_SERVICE_RULE)
-+_IT_SUBST(INTLTOOL_POLICY_RULE)
-
- # Check the gettext tools to make sure they are GNU
- AC_PATH_PROG(XGETTEXT, xgettext)
-@@ -638,12 +640,17 @@ if test -z "$xgversion" -o -z "$mmversio
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-
--AC_PATH_PROG(INTLTOOL_PERL, [perl])
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
- if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found; required for intltool])
-+ AC_MSG_ERROR([perl not found])
- fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- AC_MSG_ERROR([perl 5.x required for intltool])
-+AC_MSG_CHECKING([for perl >= 5.8.1])
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ AC_MSG_RESULT([$IT_PERL_VERSION])
- fi
- if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
-@@ -699,7 +706,7 @@ dnl The following CONFIG_COMMANDS should
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
-- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-@@ -721,6 +728,17 @@ AC_CONFIG_COMMANDS_PRE([
- ])dnl
- ])
-
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-+#
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
-+
- # deprecated macros
- AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
- # A hint is needed for aclocal from Automake <= 1.9.4:
-@@ -1103,12 +1121,12 @@ m4_define([lt_decl_dquote_varnames],
- # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
- # ---------------------------------------------------
- m4_define([lt_decl_varnames_tagged],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
-- m4_quote(m4_if([$2], [],
-- m4_quote(lt_decl_tag_varnames),
-- m4_quote(m4_shift($@)))),
-- m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
--m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-+[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...])
-@@ -1668,10 +1686,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
- _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
-+ 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?
-+ # 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' ;;
-@@ -1713,7 +1731,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-- if test "$GCC" = "yes"; then
-+ 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}"
-@@ -2235,7 +2257,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
- 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,
-@@ -2403,10 +2425,6 @@ else
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -2422,7 +2440,7 @@ int main ()
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }]
- _LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-@@ -2461,7 +2479,7 @@ else
- lt_cv_dlopen_self=yes
- ;;
-
-- mingw* | pw32*)
-+ mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-@@ -2758,6 +2776,7 @@ 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],
-@@ -2922,14 +2941,14 @@ bsdi[[45]]*)
- # libtool to hard-code these into programs
+ # Configure paths for GLIB
+ # Owen Taylor 1997-2001
+
+@@ -3379,13 +3424,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # 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
+@@ -3397,6 +3439,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
--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}`~
-@@ -2952,7 +2971,7 @@ cygwin* | mingw* | pw32*)
- 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"`
-@@ -3390,7 +3409,7 @@ tpf*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-- library_name_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}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-@@ -3414,7 +3433,7 @@ variables_saved_for_relink="PATH $shlibp
- 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
-@@ -3691,6 +3710,7 @@ _LT_DECL([], [reload_cmds], [2])dnl
- # -- 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'
-@@ -3741,6 +3761,12 @@ mingw* | pw32*)
- 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'
++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'
+ ;;
+
- darwin* | rhapsody*)
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -3988,7 +4042,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4052,7 +4078,7 @@ case $host_os in
- aix*)
- symcode='[[BCDT]]'
- ;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
- hpux*)
-@@ -4298,7 +4324,7 @@ m4_if([$1], [CXX], [
- 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
-@@ -4325,10 +4351,11 @@ m4_if([$1], [CXX], [
- 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*)
+
+-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
+@@ -4669,7 +4723,7 @@
+ ;;
+ esac
;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-@@ -4426,12 +4453,19 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
-- icpc* | ecpc* )
-- # Intel C++
-+ 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,'
-@@ -4597,7 +4631,7 @@ m4_if([$1], [CXX], [
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ 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
-@@ -4613,10 +4647,11 @@ m4_if([$1], [CXX], [
- ;;
-
- 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*)
- # +Z the default
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
;;
- *)
-@@ -4666,7 +4701,7 @@ m4_if([$1], [CXX], [
- fi
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ 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], [],
-@@ -4697,11 +4732,25 @@ m4_if([$1], [CXX], [
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
-- icc* | ecc* | ifort*)
-+ # 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)
-@@ -4883,7 +4932,7 @@ m4_if([$1], [CXX], [
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
-- cygwin* | mingw*)
-+ cygwin* | mingw* | cegcc*)
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -5094,6 +5148,9 @@
+ 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'
;;
- linux* | k*bsd*-gnu)
-@@ -4938,7 +4987,7 @@ dnl Note also adjust exclude_expsyms for
- extract_expsyms_cmds=
-
- 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++.
-@@ -4953,6 +5002,9 @@ dnl Note also adjust exclude_expsyms for
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -5158,6 +5215,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -693,210 +593,256 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5025,7 +5077,7 @@ _LT_EOF
+@@ -5340,7 +5400,7 @@
fi
;;
-- cygwin* | mingw* | pw32*)
-+ 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'
-@@ -5091,6 +5143,9 @@ _LT_EOF
- 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= ;;
-@@ -5323,6 +5378,7 @@ _LT_EOF
+- netbsd*)
++ 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=
+@@ -5515,6 +5575,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
fi
- fi
-
-+ _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
-@@ -5377,7 +5433,7 @@ _LT_EOF
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5753,7 +5814,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
;;
-- 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
-@@ -5481,7 +5537,7 @@ _LT_EOF
- _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 ${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}+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'
-@@ -6262,6 +6318,7 @@ if test "$_lt_caught_CXX_error" != yes;
- fi
+- netbsd*)
++ 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
+@@ -8962,14 +9023,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
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -9013,9 +9076,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
-
-+ _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.
-@@ -6320,7 +6377,7 @@ if test "$_lt_caught_CXX_error" != yes;
- esac
- ;;
-
-- cygwin* | mingw* | pw32*)
-+ 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'
-@@ -7701,6 +7758,18 @@ 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
-@@ -8161,7 +8230,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
- [enable_win32_dll=yes
-
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -8402,14 +8471,14 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenien
-
- # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
- #
--# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
-+# 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 5 ltsugar.m4
-+# 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])])
-@@ -8465,14 +8534,14 @@ m4_define([lt_append],
- # 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([$2], [], [],
-- [m4_if([$4], [], [],
-- [lt_join(m4_quote(m4_default([$1], [[, ]])),
-- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-- [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-- [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
--])
-+[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])
-@@ -8535,15 +8604,15 @@ m4_define([lt_dict_filter],
-
- # Generated from ltversion.in.
-
--# serial 2976 ltversion.m4
-+# serial 3012 ltversion.m4
- # This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.4])
--m4_define([LT_PACKAGE_REVISION], [1.2976])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6])
-+m4_define([LT_PACKAGE_REVISION], [1.3012])
-
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.4'
--macro_revision='1.2976'
-+[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)
- ])
-@@ -8831,7 +8900,7 @@ else
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 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,
-@@ -8846,7 +8915,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.10'
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+@@ -9062,10 +9125,10 @@
+ # 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.11'
++[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], [],
+-m4_if([$1], [1.11], [],
+m4_if([$1], [1.10.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -8860,12 +8929,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
+@@ -9081,7 +9144,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10.1])dnl
+-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -9115,19 +9184,28 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-
- # Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -9141,14 +9204,14 @@
+
+ # AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
++# 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 3
+-# serial 9
++# serial 8
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -9161,7 +9224,6 @@
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+ _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+-m4_define([_AM_COND_VALUE_$1], [$2])dnl
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+@@ -9175,14 +9237,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
++# 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.
+
+-# serial 10
++# serial 9
+
+ # 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,
+@@ -9239,16 +9301,6 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+- am__universal=false
+- m4_case([$1], [CC],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac],
+- [CXX],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac])
+-
+ 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
+@@ -9266,17 +9318,7 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- # 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. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+ case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -9286,23 +9328,19 @@
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+ 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=$am__obj \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ $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 $am__obj 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
+@@ -9366,61 +9404,59 @@
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-#serial 5
+#serial 4
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
+-[{
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- 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
+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file. Let's play safe and only enable the eval
+# if we detect the quoting.
@@ -907,91 +853,438 @@
+shift
+for mf
+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.
-@@ -9488,13 +9566,13 @@ esac
-
- # Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++ # 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
+
+
+@@ -9440,13 +9476,13 @@
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
++# 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.
--# serial 3
+-# serial 16
++# serial 13
+
+ # 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.
+@@ -9463,7 +9499,7 @@
+ # 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.62])dnl
++[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
+@@ -9514,8 +9550,8 @@
+ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+ AM_MISSING_PROG(AUTOHEADER, autoheader)
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
++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.
+@@ -9523,36 +9559,23 @@
+ 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([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
++ [_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
++ [_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
+-])
+-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+-AC_CONFIG_COMMANDS_PRE(dnl
+-[m4_provide_if([_AM_COMPILER_EXEEXT],
+- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+-])
+-
+-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+-dnl mangled by Autoconf and run in a shell conditional statement.
+-m4_define([_AC_COMPILER_EXEEXT],
+-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++])
+
+
+ # When config.status generates a header, we must update the stamp-h file.
+@@ -9576,7 +9599,7 @@
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005, 2008 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,
+@@ -9587,14 +9610,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-if test x"${install_sh}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+- *)
+- install_sh="\${SHELL} $am_aux_dir/install-sh"
+- esac
+-fi
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+ # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+@@ -9621,38 +9637,27 @@
+ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+ # From Jim Meyering
+
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# 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.
+
+-# serial 5
+# serial 4
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -9511,7 +9589,7 @@ AC_DEFUN([_AM_SET_OPTION],
- # ----------------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-Index: metacity-2.26.0/config.guess
+-# AM_MAINTAINER_MODE([DEFAULT-MODE])
+-# ----------------------------------
+-# Control maintainer-specific portions of Makefiles.
+-# Default is to disable them, unless `enable' is passed literally.
+-# For symmetry, `disable' may be passed as well. Anyway, the user
+-# can override the default with the --enable/--disable switch.
+ AC_DEFUN([AM_MAINTAINER_MODE],
+-[m4_case(m4_default([$1], [disable]),
+- [enable], [m4_define([am_maintainer_other], [disable])],
+- [disable], [m4_define([am_maintainer_other], [enable])],
+- [m4_define([am_maintainer_other], [enable])
+- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+- AC_ARG_ENABLE([maintainer-mode],
+-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
++[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=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST([MAINT])dnl
++ AC_SUBST(MAINT)dnl
+ ]
+ )
+
+@@ -9660,13 +9665,13 @@
+
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++# 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.
+
+-# serial 4
++# serial 3
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -9675,7 +9680,7 @@
+ [am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo this is the am__doit target
++ @echo done
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -9685,24 +9690,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
+-case `$am_make -s -f confmf 2> /dev/null` in #(
+-*the\ am__doit\ target*)
+- am__include=include
+- am__quote=
+- _am_result=GNU
+- ;;
+-esac
++# 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
+- case `$am_make -s -f confmf 2> /dev/null` in #(
+- *the\ am__doit\ target*)
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- ;;
+- esac
++ 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])
+@@ -9712,14 +9717,14 @@
+
+ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# 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.
+
+-# serial 6
++# serial 5
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -9736,14 +9741,7 @@
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+-if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
+-fi
++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 "
+@@ -9814,14 +9812,14 @@
+
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
++# 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 5
++# serial 4
+
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -9830,29 +9828,16 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[[\\\"\#\$\&\'\`$am_lf]]*)
+- AC_MSG_ERROR([unsafe absolute working directory name]);;
+-esac
+-case $srcdir in
+- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+-esac
+-
+ # 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`
++ 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`
++ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+@@ -9905,25 +9890,18 @@
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++# 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.
+
+-# serial 2
+-
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+ # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+-
+ # Check how to create a tarball. -*- Autoconf -*-
+
+ # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+@@ -10020,48 +9998,3 @@
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+-dnl you should install foo.schemas files
+-dnl
+-
+-AC_DEFUN([AM_GCONF_SOURCE_2],
+-[
+- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+- else
+- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+- fi
+-
+- AC_ARG_WITH([gconf-source],
+- AC_HELP_STRING([--with-gconf-source=sourceaddress],
+- [Config database for installing schema files.]),
+- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+-
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+-
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
+-
+- AC_ARG_WITH([gconf-schema-file-dir],
+- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+- [Directory for installing schema files.]),
+- [GCONF_SCHEMA_FILE_DIR="$withval"],)
+-
+- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+-
+- AC_ARG_ENABLE(schemas-install,
+- AC_HELP_STRING([--disable-schemas-install],
+- [Disable the schemas installation]),
+- [case ${enableval} in
+- yes|no) ;;
+- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+- esac])
+- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+-])
+-
+Index: mutter-2.27.1/config.guess
===================================================================
---- metacity-2.26.0.orig/config.guess 2009-06-10 21:51:15.961410199 +0200
-+++ metacity-2.26.0/config.guess 2009-06-10 21:50:28.533407204 +0200
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-23'
-+timestamp='2009-04-27'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ eval $set_cc_for_build
-+ SUN_ARCH="i386"
-+ # If there is a compiler, see if it is configured for 64-bit objects.
-+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+ # This test works for both compilers.
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ SUN_ARCH="x86_64"
-+ fi
-+ fi
-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -796,7 +812,7 @@ EOF
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd)
-+ EM64T | authenticamd | genuineintel)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -935,6 +951,9 @@ EOF
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+--- mutter-2.27.1.orig/config.guess 2009-07-16 21:31:06.000000000 +0200
++++ mutter-2.27.1/config.guess 2009-07-26 13:22:49.637791762 +0200
+@@ -954,6 +954,9 @@
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
@@ -999,50 +1292,9 @@
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -985,9 +1004,6 @@ EOF
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
-- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-@@ -1102,8 +1118,11 @@ EOF
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-@@ -1141,6 +1160,16 @@ EOF
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1216,6 +1245,9 @@ EOF
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
+@@ -1248,6 +1251,9 @@
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
@@ -1050,9 +1302,9 @@
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
-@@ -1324,6 +1356,9 @@ EOF
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+@@ -1359,6 +1365,9 @@
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
@@ -1060,153 +1312,13 @@
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-Index: metacity-2.26.0/config.h.in
+Index: mutter-2.27.1/config.sub
===================================================================
---- metacity-2.26.0.orig/config.h.in 2009-06-10 21:51:15.297405618 +0200
-+++ metacity-2.26.0/config.h.in 2009-06-10 21:50:33.549906016 +0200
-@@ -1,5 +1,8 @@
- /* config.h.in. Generated from configure.in by autoheader. */
-
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
- /* always defined to indicate that i18n is enabled */
- #undef ENABLE_NLS
-
-@@ -151,9 +154,17 @@
- /* Build with verbose mode support */
- #undef WITH_VERBOSE_MODE
-
--/* Define to 1 if your processor stores words with the most significant byte
-- first (like Motorola and SPARC, unlike Intel and VAX). */
--#undef WORDS_BIGENDIAN
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+ significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+# define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+# undef WORDS_BIGENDIAN
-+# endif
-+#endif
-
- /* Define to 1 if the X Window System is missing or not being used. */
- #undef X_DISPLAY_MISSING
-Index: metacity-2.26.0/config.sub
-===================================================================
---- metacity-2.26.0.orig/config.sub 2009-06-10 21:51:15.825909244 +0200
-+++ metacity-2.26.0/config.sub 2009-06-10 21:50:28.561906009 +0200
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-16'
-+timestamp='2009-04-17'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -249,13 +250,16 @@ case $basic_machine in
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep \
-+ | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-- | mips64vr | mips64vrel \
-+ | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
-+ | mips64r5900 | mips64r5900el \
-+ | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-@@ -268,6 +272,7 @@ case $basic_machine in
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-+ | moxie \
- | mt \
- | msp430 \
- | nios | nios2 \
-@@ -277,7 +282,7 @@ case $basic_machine in
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | score \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -286,7 +291,7 @@ case $basic_machine in
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-- | z8k)
-+ | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -329,14 +334,17 @@ case $basic_machine in
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-- | mips64vr-* | mips64vrel-* \
-+ | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
-+ | mips64r5900-* | mips64r5900el-* \
-+ | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-@@ -358,20 +366,20 @@ case $basic_machine in
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
-- | z8k-*)
-+ | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
-@@ -439,6 +447,10 @@ case $basic_machine in
- basic_machine=m68k-apollo
- os=-bsd
+--- mutter-2.27.1.orig/config.sub 2009-07-16 21:31:07.000000000 +0200
++++ mutter-2.27.1/config.sub 2009-07-26 13:22:49.641790919 +0200
+@@ -451,6 +451,10 @@
+ basic_machine=i386-pc
+ os=-aros
;;
+ aros)
+ basic_machine=i386-pc
@@ -1215,9 +1327,9 @@
aux)
basic_machine=m68k-apple
os=-aux
-@@ -459,6 +471,10 @@ case $basic_machine in
- basic_machine=c90-cray
- os=-unicos
+@@ -475,6 +479,10 @@
+ basic_machine=arm-unknown
+ os=-cegcc
;;
+ cegcc)
+ basic_machine=arm-unknown
@@ -1226,9 +1338,9 @@
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -526,6 +542,10 @@ case $basic_machine in
- basic_machine=m88k-motorola
- os=-sysv3
+@@ -546,6 +554,10 @@
+ basic_machine=i686-pc
+ os=-dicos
;;
+ dicos)
+ basic_machine=i686-pc
@@ -1237,8 +1349,8 @@
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
-@@ -1128,6 +1148,10 @@ case $basic_machine in
- basic_machine=z8k-unknown
+@@ -1152,6 +1164,10 @@
+ basic_machine=z80-unknown
os=-sim
;;
+ z80-*-coff)
@@ -1248,38 +1360,9 @@
none)
basic_machine=none-none
os=-none
-@@ -1166,7 +1190,7 @@ case $basic_machine in
- we32k)
- basic_machine=we32k-att
- ;;
-- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1238,8 +1262,9 @@ case $os in
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-- | -aos* \
-+ | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1248,7 +1273,7 @@ case $os in
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* \
-+ | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1388,6 +1413,9 @@ case $os in
- -zvmoe)
- os=-zvmoe
+@@ -1416,6 +1432,9 @@
+ -dicos*)
+ os=-dicos
;;
+ -dicos*)
+ os=-dicos
@@ -1287,5010 +1370,219 @@
-none)
;;
*)
-Index: metacity-2.26.0/configure
+Index: mutter-2.27.1/configure
===================================================================
---- metacity-2.26.0.orig/configure 2009-06-10 21:51:15.153407293 +0200
-+++ metacity-2.26.0/configure 2009-06-10 21:50:35.801902559 +0200
-@@ -1,11 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for metacity 2.26.0.
-+# Generated by GNU Autoconf 2.63 for metacity 2.26.0.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=metacity>.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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=:
-- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # 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
-@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- 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=';'
-+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
-- PATH_SEPARATOR=:
-+ 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
-- rm -f conf$$.sh
-+ 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.
-@@ -65,8 +93,6 @@ 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.
-@@ -89,7 +115,7 @@ 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
-+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -102,17 +128,10 @@ 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
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -160,7 +179,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)
- }
-@@ -242,7 +261,7 @@ IFS=$as_save_IFS
- 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
-+ # 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
-@@ -263,7 +282,7 @@ _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
-+ # 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
-@@ -343,10 +362,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
-
-
-@@ -415,9 +434,10 @@ fi
-
- test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
-- echo Please tell autoconf at gnu.org about your system,
-- echo including any error possibly output before this
-- echo message
-+ echo Please tell bug-autoconf at 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.
- }
-
-
-@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
- 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
-+ { $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
-@@ -481,7 +501,6 @@ 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
-@@ -494,19 +513,22 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir
-+ mkdir conf$$.dir 2>/dev/null
- 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 ||
-+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'
--elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-+ fi
- else
- as_ln_s='cp -p'
- fi
-@@ -531,10 +553,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
-@@ -764,193 +786,224 @@ ac_includes_default="\
+--- mutter-2.27.1.orig/configure 2009-07-17 00:02:04.000000000 +0200
++++ mutter-2.27.1/configure 2009-07-26 13:23:02.157791236 +0200
+@@ -786,9 +786,7 @@
# include <unistd.h>
#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
--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
--MAINTAINER_MODE_TRUE
--MAINTAINER_MODE_FALSE
--MAINT
--ACLOCAL_AMFLAGS
--GETTEXT_PACKAGE
--USE_NLS
--INTLTOOL_UPDATE
--INTLTOOL_MERGE
--INTLTOOL_EXTRACT
--INTLTOOL_DESKTOP_RULE
--INTLTOOL_DIRECTORY_RULE
--INTLTOOL_KEYS_RULE
--INTLTOOL_PROP_RULE
--INTLTOOL_OAF_RULE
--INTLTOOL_PONG_RULE
--INTLTOOL_SERVER_RULE
--INTLTOOL_SHEET_RULE
--INTLTOOL_SOUNDLIST_RULE
--INTLTOOL_UI_RULE
--INTLTOOL_XAM_RULE
--INTLTOOL_KBD_RULE
--INTLTOOL_XML_RULE
--INTLTOOL_XML_NOMERGE_RULE
--INTLTOOL_CAVES_RULE
--INTLTOOL_SCHEMAS_RULE
--INTLTOOL_THEME_RULE
--INTLTOOL_SERVICE_RULE
--INTLTOOL_POLICY_RULE
--XGETTEXT
--MSGMERGE
--MSGFMT
--GMSGFMT
--INTLTOOL_PERL
--ALL_LINGUAS
--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
--DATADIRNAME
--CPP
--GREP
--EGREP
--build
--build_cpu
--build_vendor
--build_os
--host
--host_cpu
--host_vendor
--host_os
--AS
--DLLTOOL
--OBJDUMP
--LIBTOOL
--SED
--FGREP
--LD
--DUMPBIN
--ac_ct_DUMPBIN
--NM
--LN_S
--AR
--RANLIB
--lt_ECHO
--DSYMUTIL
--NMEDIT
--LIPO
--OTOOL
--OTOOL64
--MSGFMT_OPTS
--CATALOGS
--CATOBJEXT
--GMOFILES
--INSTOBJEXT
--INTLLIBS
--PO_IN_DATADIR_TRUE
--PO_IN_DATADIR_FALSE
--POFILES
--POSUB
--MKINSTALLDIRS
--PKG_CONFIG
--ALL_CFLAGS
--ALL_LIBS
--METACITY_MESSAGE_CFLAGS
--METACITY_MESSAGE_LIBS
--METACITY_WINDOW_DEMO_CFLAGS
--METACITY_WINDOW_DEMO_LIBS
--GNOME_KEYBINDINGS_KEYSDIR
--METACITY_CFLAGS
--METACITY_LIBS
--XMKMF
--X_CFLAGS
--X_PRE_LIBS
--X_LIBS
--X_EXTRA_LIBS
--HAVE_SM_TRUE
--HAVE_SM_FALSE
--HOST_ALIAS
--GDK_PIXBUF_CSOURCE
--GCONFTOOL
--GCONF_SCHEMA_CONFIG_SOURCE
--GCONF_SCHEMA_FILE_DIR
--GCONF_SCHEMAS_INSTALL_TRUE
--GCONF_SCHEMAS_INSTALL_FALSE
--ZENITY
--HELP_DIR
--OMF_DIR
--DOC_USER_FORMATS
--ENABLE_SK_TRUE
--ENABLE_SK_FALSE
--DISTCHECK_CONFIGURE_FLAGS
--HAVE_GNOME_DOC_UTILS_TRUE
--HAVE_GNOME_DOC_UTILS_FALSE
+-ac_subst_vars='am__EXEEXT_FALSE
+-am__EXEEXT_TRUE
+-LTLIBOBJS
+ac_subst_vars='LTLIBOBJS
LIBOBJS
--LTLIBOBJS'
-+HAVE_GNOME_DOC_UTILS_FALSE
-+HAVE_GNOME_DOC_UTILS_TRUE
-+DISTCHECK_CONFIGURE_FLAGS
-+ENABLE_SK_FALSE
-+ENABLE_SK_TRUE
-+DOC_USER_FORMATS
-+OMF_DIR
-+HELP_DIR
-+ZENITY
-+GCONF_SCHEMAS_INSTALL_FALSE
-+GCONF_SCHEMAS_INSTALL_TRUE
-+GCONF_SCHEMA_FILE_DIR
-+GCONF_SCHEMA_CONFIG_SOURCE
-+GCONFTOOL
-+GDK_PIXBUF_CSOURCE
-+HOST_ALIAS
-+HAVE_SM_FALSE
-+HAVE_SM_TRUE
-+X_EXTRA_LIBS
-+X_LIBS
-+X_PRE_LIBS
-+X_CFLAGS
-+XMKMF
-+METACITY_LIBS
-+METACITY_CFLAGS
-+GNOME_KEYBINDINGS_KEYSDIR
-+METACITY_WINDOW_DEMO_LIBS
-+METACITY_WINDOW_DEMO_CFLAGS
-+METACITY_MESSAGE_LIBS
-+METACITY_MESSAGE_CFLAGS
-+ALL_LIBS
-+ALL_CFLAGS
-+PKG_CONFIG
-+MKINSTALLDIRS
-+POSUB
-+POFILES
-+PO_IN_DATADIR_FALSE
-+PO_IN_DATADIR_TRUE
-+INTLLIBS
-+INSTOBJEXT
-+GMOFILES
-+CATOBJEXT
-+CATALOGS
-+MSGFMT_OPTS
-+OTOOL64
-+OTOOL
-+LIPO
-+NMEDIT
-+DSYMUTIL
-+lt_ECHO
-+RANLIB
-+AR
-+LN_S
-+NM
-+ac_ct_DUMPBIN
-+DUMPBIN
-+LD
-+FGREP
-+SED
-+LIBTOOL
-+OBJDUMP
-+DLLTOOL
-+AS
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+EGREP
-+GREP
-+CPP
-+DATADIRNAME
-+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
-+ALL_LINGUAS
-+INTLTOOL_PERL
-+GMSGFMT
-+MSGFMT
-+MSGMERGE
-+XGETTEXT
-+INTLTOOL_POLICY_RULE
-+INTLTOOL_SERVICE_RULE
-+INTLTOOL_THEME_RULE
-+INTLTOOL_SCHEMAS_RULE
-+INTLTOOL_CAVES_RULE
-+INTLTOOL_XML_NOMERGE_RULE
-+INTLTOOL_XML_RULE
-+INTLTOOL_KBD_RULE
-+INTLTOOL_XAM_RULE
-+INTLTOOL_UI_RULE
-+INTLTOOL_SOUNDLIST_RULE
-+INTLTOOL_SHEET_RULE
-+INTLTOOL_SERVER_RULE
-+INTLTOOL_PONG_RULE
-+INTLTOOL_OAF_RULE
-+INTLTOOL_PROP_RULE
-+INTLTOOL_KEYS_RULE
-+INTLTOOL_DIRECTORY_RULE
-+INTLTOOL_DESKTOP_RULE
-+INTLTOOL_EXTRACT
-+INTLTOOL_MERGE
-+INTLTOOL_UPDATE
-+USE_NLS
-+GETTEXT_PACKAGE
-+ACLOCAL_AMFLAGS
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+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
-+PATH_SEPARATOR
-+SHELL'
- ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_maintainer_mode
-+enable_nls
-+enable_dependency_tracking
-+enable_shared
-+enable_static
-+with_pic
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+enable_gconf
-+enable_verbose_mode
-+enable_sm
-+enable_startup_notification
-+enable_compositor
-+enable_xsync
-+enable_render
-+enable_shape
-+with_x
-+enable_xinerama
-+with_gconf_source
-+with_gconf_schema_file_dir
-+enable_schemas_install
-+enable_debug
-+with_help_dir
-+with_omf_dir
-+with_help_formats
-+enable_scrollkeeper
-+'
- ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -975,6 +1028,8 @@ 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
-@@ -1073,13 +1128,21 @@ do
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ ac_useropt=`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
-+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-- eval enable_$ac_feature=no ;;
-+ 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 ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
-@@ -1092,13 +1155,21 @@ do
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
-- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ ac_useropt=`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
-+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-- eval enable_$ac_feature=\$ac_optarg ;;
-+ 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 ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1289,22 +1360,38 @@ do
- ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ ac_useropt=`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
-+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-- eval with_$ac_package=\$ac_optarg ;;
-+ 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 ;;
-
- -without-* | --without-*)
-- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ ac_useropt=`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
-+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-- eval with_$ac_package=no ;;
-+ 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 ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -1324,7 +1411,7 @@ do
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
-- -*) { echo "$as_me: error: unrecognized option: $ac_option
-+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-@@ -1333,16 +1420,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 &&
-- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { $as_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
-+ $as_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
-+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
-@@ -1351,22 +1438,38 @@ 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
-+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute directory names.
-+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.
- 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
-- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
- done
-
-@@ -1381,7 +1484,7 @@ target=$target_alias
- 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.
-+ $as_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
-@@ -1397,10 +1500,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 .` ||
-- { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { $as_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
-+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
-@@ -1408,12 +1511,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 -- "$0" ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$0" : 'X\(//\)[^/]' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$0" |
-+ 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" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -1440,12 +1543,12 @@ else
- 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
-+ { $as_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
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
- pwd)`
- # When building in place, set srcdir=.
-@@ -1494,9 +1597,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
-@@ -1506,25 +1609,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/metacity]
-- --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/metacity]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1551,6 +1654,7 @@ 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]
- --enable-maintainer-mode enable make rules and dependencies not useful
-@@ -1578,7 +1682,8 @@ Optional Features:
- --disable-shape disable metacity's use of the shaped window
- extension
- --disable-xinerama disable metacity's use of the Xinerama extension
-- --disable-schemas-install Disable the schemas installation
-+ --disable-schemas-install
-+ Disable the schemas installation
- --enable-debug enable debugging
- --disable-scrollkeeper do not make updates to the scrollkeeper database
-
-@@ -1635,15 +1740,17 @@ 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
-+ test -d "$ac_dir" ||
-+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && 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,^\.[\\/],,'`
-+ ac_dir_suffix=/`$as_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,/,,'`
-+ 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/ ;;
-@@ -1679,7 +1786,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
-- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-@@ -1689,10 +1796,10 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- metacity configure 2.26.0
--generated by GNU Autoconf 2.61
-+generated by GNU Autoconf 2.63
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1703,7 +1810,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by metacity $as_me 2.26.0, which was
--generated by GNU Autoconf 2.61. Invocation command line was
-+generated by GNU Autoconf 2.63. Invocation command line was
-
- $ $0 $@
-
-@@ -1739,7 +1846,7 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- echo "PATH: $as_dir"
-+ $as_echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
-
-@@ -1774,7 +1881,7 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
-- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -1826,11 +1933,12 @@ _ASBOX
- 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;} ;;
-+ *_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
-@@ -1860,9 +1968,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- echo "$ac_var='\''$ac_val'\''"
-+ $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
-@@ -1877,9 +1985,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- echo "$ac_var='\''$ac_val'\''"
-+ $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1895,8 +2003,8 @@ _ASBOX
- echo
- fi
- test "$ac_signal" != 0 &&
-- echo "$as_me: caught signal $ac_signal"
-- echo "$as_me: exit $exit_status"
-+ $as_echo "$as_me: caught signal $ac_signal"
-+ $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -1938,21 +2046,24 @@ _ACEOF
-
-
- # Let the site file select an alternate cache file if it wants to.
--# Prefer explicitly selected file to automatically selected ones.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
-- set x "$CONFIG_SITE"
-+ ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
-- set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+ ac_site_file1=$prefix/share/config.site
-+ ac_site_file2=$prefix/etc/config.site
- else
-- set x "$ac_default_prefix/share/config.site" \
-- "$ac_default_prefix/etc/config.site"
-+ ac_site_file1=$ac_default_prefix/share/config.site
-+ ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--shift
--for ac_site_file
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-+ test "x$ac_site_file" = xNONE && continue
- 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;}
-+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-@@ -1962,16 +2073,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
-- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
-+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+$as_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;}
-+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
- fi
-
-@@ -1985,29 +2096,38 @@ 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,)
-- { 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;}
-+ { $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;}
- 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;}
-+ { $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;}
- 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=:
-+ # 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;}
- 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=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -2017,10 +2137,12 @@ echo "$as_me: current value: $ac_new_v
- 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;}
-+ { $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;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2079,8 +2201,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
- 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;}
-+ { { $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;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2106,11 +2228,12 @@ 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.
--{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+# 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
-- 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
-@@ -2139,17 +2262,29 @@ case $as_dir/ in
- # 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
-+ 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
- ;;
- esac
-+
- done
- IFS=$as_save_IFS
-
-+rm -rf conftest.one conftest.two conftest.dir
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-@@ -2162,8 +2297,8 @@ fi
- INSTALL=$ac_install_sh
- fi
- fi
--{ echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6; }
-+{ $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.
-@@ -2173,8 +2308,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
-
- 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; }
-+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
+ HAVE_GNOME_DOC_UTILS_FALSE
+ HAVE_GNOME_DOC_UTILS_TRUE
+@@ -2216,7 +2214,7 @@
+ ac_config_headers="$ac_config_headers config.h"
+
+
+-am__api_version='1.11'
++am__api_version='1.10'
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2347,33 +2345,16 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -2197,9 +2332,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".
-- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+ { { $as_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
-+$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; }; }
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[\\\"\#\$\&\'\`$am_lf]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+- { (exit 1); exit 1; }; };;
+-esac
+-case $srcdir in
+- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+- { (exit 1); exit 1; }; };;
+-esac
+-
+ # 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`
++ 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`
++ set X `ls -t $srcdir/configure conftest.file`
fi
-@@ -2210,26 +2345,23 @@ then
- # Ok.
- :
- else
-- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+ { { $as_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!
-+$as_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; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "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.
-+# Double any \ or $.
- # 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
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2417,14 +2398,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2240,15 +2372,15 @@ if eval "$MISSING --run true"; then
+
+-if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
+-fi
++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;}
-+ { $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;}
+@@ -2434,115 +2408,6 @@
+ $as_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; }
-+{ $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 x"${install_sh}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+- *)
+- install_sh="\${SHELL} $am_aux_dir/install-sh"
+- esac
+-fi
+-
+-# 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
+-{ $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
+-
+-fi
+-fi
+-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; }
+-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
+-{ $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
+-
+-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
+-
+- 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 ;;
+-esac
+- STRIP=$ac_ct_STRIP
+- fi
+-else
+- STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ { $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
-@@ -2283,8 +2415,8 @@ fi
- 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
-@@ -2296,10 +2428,10 @@ 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; }
+@@ -2725,6 +2590,108 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
++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
+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2312,7 +2444,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2323,22 +2455,23 @@ fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- { echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-+$as_echo "$AWK" >&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 "$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'`
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -2355,12 +2488,12 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- SET_MAKE=
- 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; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -2379,8 +2512,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
- 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
-@@ -2435,10 +2568,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
--{ 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_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2451,7 +2584,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2462,11 +2595,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&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
-
-
-@@ -2475,10 +2608,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
--{ 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_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -2491,7 +2624,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2502,11 +2635,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&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
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -2514,12 +2647,8 @@ fi
- 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 at 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 at 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
- STRIP=$ac_ct_STRIP
-@@ -2543,8 +2672,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
-
-
-
--{ 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; }
-+{ $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
-@@ -2552,8 +2681,8 @@ else
- USE_MAINTAINER_MODE=no
- fi
-
-- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$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
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-@@ -2579,8 +2708,8 @@ _ACEOF
-
-
-
-- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
--echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
- # Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then
- enableval=$enable_nls; USE_NLS=$enableval
-@@ -2588,8 +2717,8 @@ else
- USE_NLS=yes
- fi
-
-- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
--echo "${ECHO_T}$USE_NLS" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+$as_echo "$USE_NLS" >&6; }
-
-
- DEPDIR="${am__leading_dot}deps"
-@@ -2604,8 +2733,8 @@ am__doit:
- .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; }
-+{ $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; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -2632,8 +2761,8 @@ if test "$am__include" = "#"; then
- fi
-
-
--{ echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
- rm -f confinc confmf
-
- # Check whether --enable-dependency-tracking was given.
-@@ -2662,10 +2791,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2678,7 +2807,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2689,11 +2818,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -2702,10 +2831,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2718,7 +2847,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2729,11 +2858,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&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
-
- if test "x$ac_ct_CC" = x; then
-@@ -2741,12 +2870,8 @@ fi
- 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 at 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 at 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
- CC=$ac_ct_CC
-@@ -2759,10 +2884,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2775,7 +2900,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2786,11 +2911,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -2799,10 +2924,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2820,7 +2945,7 @@ do
- continue
- fi
- ac_cv_prog_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2843,11 +2968,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -2858,10 +2983,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2874,7 +2999,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2885,11 +3010,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -2902,10 +3027,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2918,7 +3043,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2929,11 +3054,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&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
-
-
-@@ -2945,12 +3070,8 @@ done
- 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 at 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 at 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
- CC=$ac_ct_CC
-@@ -2960,44 +3081,50 @@ fi
- fi
-
-
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+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
--echo "$as_me: error: no acceptable C compiler found in \$PATH
-+$as_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.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3016,27 +3143,22 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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.
-+{ $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.*"
-+
- 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
- done
-@@ -3047,10 +3169,11 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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'
-@@ -3061,7 +3184,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 | *.o | *.obj )
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
-@@ -3088,25 +3211,27 @@ else
- ac_file=''
- fi
-
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { $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
- See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
-+$as_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.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&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
-@@ -3115,49 +3240,53 @@ if test "$cross_compiling" != yes; then
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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.
-+ { { $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.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
-+$as_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
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM 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; }
-+{ $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 for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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
-@@ -3166,31 +3295,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.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
-+ { { $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
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+$as_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
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+$as_echo "$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; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3213,40 +3344,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
-+{ { $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
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+$as_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
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+$as_echo "$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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3272,20 +3406,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_compiler_gnu=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -3295,15 +3430,19 @@ rm -f core conftest.err conftest.$ac_obj
- 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`
-+{ $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
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-@@ -3330,20 +3469,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_g=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
-@@ -3368,20 +3508,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- :
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3407,20 +3548,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_g=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3435,8 +3577,8 @@ 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; }
-+{ $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
-@@ -3452,10 +3594,10 @@ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -3526,20 +3668,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3555,15 +3698,15 @@ 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
-
-
-@@ -3575,10 +3718,10 @@ 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; }
-+{ $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
-@@ -3666,8 +3809,8 @@ else
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ $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
-@@ -3686,8 +3829,8 @@ fi
-
- case "$am__api_version" in
- 1.01234)
-- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-+$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- *)
-@@ -3695,27 +3838,27 @@ echo "$as_me: error: Automake 1.5 or new
- esac
-
- if test -n "0.34.90"; then
-- { echo "$as_me:$LINENO: checking for intltool >= 0.34.90" >&5
--echo $ECHO_N "checking for intltool >= 0.34.90... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.34.90" >&5
-+$as_echo_n "checking for intltool >= 0.34.90... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.34.90 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.34.90 or later." >&5
--echo "$as_me: error: Your intltool is too old. You need intltool 0.34.90 or later." >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.34.90 or later." >&5
-+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.34.90 or later." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; 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_path_INTLTOOL_UPDATE+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
- [\\/]* | ?:[\\/]*)
-@@ -3730,7 +3873,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_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3742,20 +3885,20 @@ esac
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
--echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+$as_echo "$INTLTOOL_UPDATE" >&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
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; 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_path_INTLTOOL_MERGE+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
- [\\/]* | ?:[\\/]*)
-@@ -3770,7 +3913,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_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3782,20 +3925,20 @@ esac
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
--echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+$as_echo "$INTLTOOL_MERGE" >&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
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; 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_path_INTLTOOL_EXTRACT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
- [\\/]* | ?:[\\/]*)
-@@ -3810,7 +3953,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_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3822,17 +3965,17 @@ esac
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
--echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+$as_echo "$INTLTOOL_EXTRACT" >&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
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-+$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -3876,13 +4019,89 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- # Check the gettext tools to make sure they are GNU
- # 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
- [\\/]* | ?:[\\/]*)
-@@ -3897,7 +4116,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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3909,20 +4128,20 @@ esac
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&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
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; 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_path_MSGMERGE+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
- [\\/]* | ?:[\\/]*)
-@@ -3937,7 +4156,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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3949,20 +4168,20 @@ esac
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
--echo "${ECHO_T}$MSGMERGE" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+$as_echo "$MSGMERGE" >&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
-
-
- # 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
- [\\/]* | ?:[\\/]*)
-@@ -3977,7 +4196,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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3989,20 +4208,20 @@ esac
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&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
-
-
- # 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
-@@ -4017,7 +4236,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4030,34 +4249,34 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&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
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; 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_path_INTLTOOL_PERL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
- [\\/]* | ?:[\\/]*)
-@@ -4072,7 +4291,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_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4084,33 +4303,40 @@ esac
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+$as_echo "$INTLTOOL_PERL" >&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
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--echo "$as_me: error: perl not found; required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-+$as_echo "$as_me: error: perl not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--echo "$as_me: error: perl 5.x required for intltool" >&2;}
-+{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+$as_echo "$IT_PERL_VERSION" >&6; }
- fi
- if test "x" != "xno-xml"; then
-- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
--echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+$as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: ok" >&5
-+$as_echo "ok" >&6; }
- else
-- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-+$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -4143,29 +4369,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- DATADIRNAME=share
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4218,32 +4447,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_bind_textdomain_codeset=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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
- DATADIRNAME=share
- else
- DATADIRNAME=lib
-@@ -4256,6 +4489,7 @@ 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
- fi
-@@ -4272,10 +4506,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4288,7 +4522,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4299,11 +4533,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -4312,10 +4546,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4328,7 +4562,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4339,11 +4573,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&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
-
- if test "x$ac_ct_CC" = x; then
-@@ -4351,12 +4585,8 @@ fi
- 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 at 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 at 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
- CC=$ac_ct_CC
-@@ -4369,10 +4599,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4385,7 +4615,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4396,11 +4626,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -4409,10 +4639,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4430,7 +4660,7 @@ do
- continue
- fi
- ac_cv_prog_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4453,11 +4683,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -4468,10 +4698,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4484,7 +4714,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4495,11 +4725,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&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
-
-
-@@ -4512,10 +4742,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
--{ 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_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4528,7 +4758,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4539,11 +4769,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&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
-
-
-@@ -4555,12 +4785,8 @@ done
- 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 at 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 at 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
- CC=$ac_ct_CC
-@@ -4570,50 +4796,56 @@ fi
- fi
-
-
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+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
--echo "$as_me: error: no acceptable C compiler found in \$PATH
-+$as_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.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4639,20 +4871,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_compiler_gnu=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -4662,15 +4895,19 @@ rm -f core conftest.err conftest.$ac_obj
- 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`
-+{ $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
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-@@ -4697,20 +4934,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_g=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
-@@ -4735,20 +4973,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- :
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -4774,20 +5013,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_g=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -4802,8 +5042,8 @@ 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; }
-+{ $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
-@@ -4819,10 +5059,10 @@ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -4893,20 +5133,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -4922,15 +5163,15 @@ 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
-
-
-@@ -4942,10 +5183,10 @@ 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; }
-+{ $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
-@@ -5033,8 +5274,8 @@ else
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ $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
-@@ -5048,10 +5289,10 @@ else
- fi
-
-
--{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
--echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5089,26 +5330,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_search_strerror=$ac_res
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
- if test "${ac_cv_search_strerror+set}" = set; then
-@@ -5123,8 +5368,8 @@ 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; }
-+{ $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"
-@@ -5136,15 +5381,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
--{ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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"
-@@ -5176,20 +5421,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -5213,13 +5459,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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
-@@ -5227,7 +5474,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- # Broken: success on invalid input.
- continue
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -5252,8 +5499,8 @@ fi
- else
- ac_cv_prog_CPP=$CPP
- fi
--{ echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6; }
-+{ $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
-@@ -5281,20 +5528,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -5318,13 +5566,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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
-@@ -5332,7 +5581,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- # Broken: success on invalid input.
- continue
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -5348,11 +5597,13 @@ rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
- :
- else
-- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+ { { $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: error: C preprocessor \"$CPP\" fails sanity check
-+$as_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
-@@ -5362,42 +5613,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--{ 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
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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
-+ # 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
-- 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"
-+ $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`
-@@ -5412,74 +5658,60 @@ 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
-+ $ac_path_GREP_found && break 3
-+ done
- 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;}
-+ 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
--
-+ 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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+$as_echo "$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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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
-- # 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
-+ 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
-+ # 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
-- 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 'EGREP' >> "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`
-@@ -5494,40 +5726,31 @@ 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
-+ $ac_path_EGREP_found && break 3
-+ done
- 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;}
-+ 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
--
-+ 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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5554,20 +5777,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_header_stdc=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-@@ -5659,37 +5883,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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
-+ $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 )
- 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
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+{ $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
-@@ -5700,34 +5927,34 @@ fi
-
- # 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;}
-+ { { $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;}
- { (exit 1); exit 1; }; }
-
--{ echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
- if test "${ac_cv_build+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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;}
-+ { { $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;}
- { (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;}
-+ { { $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;}
- { (exit 1); exit 1; }; }
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+$as_echo "$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;}
-+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- build=$ac_cv_build
-@@ -5744,27 +5971,27 @@ 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; }
-+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
- if test "${ac_cv_host+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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;}
-+ { { $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;}
- { (exit 1); exit 1; }; }
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+$as_echo "$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;}
-+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- host=$ac_cv_host
-@@ -5784,14 +6011,14 @@ case $host_os in *\ *) host_os=`echo "$h
- enable_win32_dll=yes
-
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+*-*-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
--{ 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_AS+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$AS"; then
- ac_cv_prog_AS="$AS" # Let the user override the test.
-@@ -5804,7 +6031,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5815,11 +6042,11 @@ fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- { echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $AS" >&5
-+$as_echo "$AS" >&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
-
-
-@@ -5828,10 +6055,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
--{ 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_AS+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -5844,7 +6071,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5855,11 +6082,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+$as_echo "$ac_ct_AS" >&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
-
- if test "x$ac_ct_AS" = x; then
-@@ -5867,12 +6094,8 @@ fi
- 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 at 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 at 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
- AS=$ac_ct_AS
-@@ -5884,10 +6107,10 @@ fi
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-@@ -5900,7 +6123,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5911,11 +6134,11 @@ fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
-- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--echo "${ECHO_T}$DLLTOOL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+$as_echo "$DLLTOOL" >&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
-
-
-@@ -5924,10 +6147,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
--{ 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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -5940,7 +6163,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5951,11 +6174,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+$as_echo "$ac_ct_DLLTOOL" >&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
-
- if test "x$ac_ct_DLLTOOL" = x; then
-@@ -5963,12 +6186,8 @@ fi
- 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 at 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 at 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
- DLLTOOL=$ac_ct_DLLTOOL
-@@ -5980,10 +6199,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
--{ 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_OBJDUMP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -5996,7 +6215,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6007,11 +6226,11 @@ fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
-- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&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
-
-
-@@ -6020,10 +6239,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
--{ 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_OBJDUMP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -6036,7 +6255,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6047,11 +6266,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&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
-
- if test "x$ac_ct_OBJDUMP" = x; then
-@@ -6059,12 +6278,8 @@ fi
- 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 at 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 at 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
- OBJDUMP=$ac_ct_OBJDUMP
-@@ -6098,14 +6313,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-
- case `pwd` in
- *\ * | *\ *)
-- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
--echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-+ { $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.4'
--macro_revision='1.2976'
-+macro_version='2.2.6'
-+macro_revision='1.3012'
-
-
-
-@@ -6121,48 +6336,43 @@ macro_revision='1.2976'
-
- ltmain="$ac_aux_dir/ltmain.sh"
-
--{ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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" | sed 99q >conftest.sed
-+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
-- # Extract the first word of "sed gsed" to use in msg output
--if test -z "$SED"; then
--set dummy sed gsed; ac_prog_name=$2
--if test "${ac_cv_path_SED+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+ 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
-+ # 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.
-+ 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
- *GNU*)
- 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 '' >> "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`
-@@ -6177,31 +6387,23 @@ case `"$ac_path_SED" --version 2>&1` in
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
--
-- $ac_path_SED_found && break 3
-+ $ac_path_SED_found && break 3
-+ done
- done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--SED="$ac_cv_path_SED"
--if test -z "$SED"; then
-- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
-+ 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
- else
- ac_cv_path_SED=$SED
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
--echo "${ECHO_T}$ac_cv_path_SED" >&6; }
-+{ $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
-
-@@ -6218,45 +6420,40 @@ Xsed="$SED -e 1s/^X//"
-
-
-
--{ echo "$as_me:$LINENO: checking for fgrep" >&5
--echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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
-- # Extract the first word of "fgrep" to use in msg output
--if test -z "$FGREP"; then
--set dummy fgrep; ac_prog_name=$2
--if test "${ac_cv_path_FGREP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--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
-+ # 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.
-+ 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
-- 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 'FGREP' >> "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`
-@@ -6271,33 +6468,24 @@ case `"$ac_path_FGREP" --version 2>&1` i
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
--
-- $ac_path_FGREP_found && break 3
-+ $ac_path_FGREP_found && break 3
-+ done
- done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--FGREP="$ac_cv_path_FGREP"
--if test -z "$FGREP"; 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;}
-+ 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
--
-+ fi
- else
- ac_cv_path_FGREP=$FGREP
- fi
-
--
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
--echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-@@ -6331,8 +6519,8 @@ 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; }
-+ { $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
-@@ -6361,14 +6549,14 @@ echo $ECHO_N "checking for ld used by $C
- ;;
- 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; }
-+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
- else
-- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -6398,19 +6586,19 @@ fi
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- { echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+$as_echo "$LD" >&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 -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;}
-+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; }; }
--{ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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
-@@ -6422,8 +6610,8 @@ case `$LD -v 2>&1 </dev/null` in
- ;;
- esac
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+{ $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
-
-
-@@ -6434,10 +6622,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
--{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
--echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$NM"; then
- # Let the user override the test.
-@@ -6483,8 +6671,8 @@ else
- : ${lt_cv_path_NM=no}
- fi
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-+{ $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
-@@ -6494,10 +6682,10 @@ else
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$DUMPBIN"; then
- ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-@@ -6510,7 +6698,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_DUMPBIN="$ac_tool_prefix$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6521,11 +6709,11 @@ fi
- fi
- DUMPBIN=$ac_cv_prog_DUMPBIN
- if test -n "$DUMPBIN"; then
-- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
--echo "${ECHO_T}$DUMPBIN" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+$as_echo "$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
-
-
-@@ -6538,10 +6726,10 @@ if test -z "$DUMPBIN"; 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
--{ 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_DUMPBIN+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -6554,7 +6742,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_DUMPBIN="$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6565,11 +6753,11 @@ fi
- fi
- ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
- if test -n "$ac_ct_DUMPBIN"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
--echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
-+ { $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
-
-
-@@ -6581,12 +6769,8 @@ done
- 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 at 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 at 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
- DUMPBIN=$ac_ct_DUMPBIN
-@@ -6605,45 +6789,45 @@ test -z "$NM" && NM=nm
-
-
-
--{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
--echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6615: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6799: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:6618: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6802: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:6621: output\"" >&5)
-+ (eval echo "\"\$as_me:6805: 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
--{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
--echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
-
--{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&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
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
-- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+$as_echo "no, using $LN_S" >&6; }
- fi
-
- # 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
-+ $as_echo_n "(cached) " >&6
- else
- i=0
- teststring="ABCD"
-@@ -6664,7 +6848,7 @@ else
- 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,
-@@ -6760,11 +6944,11 @@ else
- 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; }
-+ { $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: none" >&5
--echo "${ECHO_T}none" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
-
-@@ -6777,8 +6961,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
- : ${MV="mv -f"}
- : ${RM="rm -f"}
-
--{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
--echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
-+{ $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"
-@@ -6787,18 +6971,18 @@ xsi_shell=no
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
--{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
--echo "${ECHO_T}$xsi_shell" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-
-
--{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
--echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&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
--{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
--echo "${ECHO_T}$lt_shell_append" >&6; }
-+{ $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
-@@ -6832,44 +7016,142 @@ esac
-
-
-
--{ 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
-+{ $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
++if test "${ac_cv_prog_STRIP+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.
++ 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
@@ -6299,7 +1591,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_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -6309,10 +1601,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; }
++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; }
@@ -6320,17 +1612,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_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_OBJDUMP+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_OBJDUMP"; then
-+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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
@@ -6339,7 +1631,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_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -6349,37 +1641,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; }
- else
-- lt_cv_ld_reload_flag='-r'
++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
--{ 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
--
--
-
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
++fi
++
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
@@ -6387,1559 +1659,287 @@
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
++ STRIP=$ac_ct_STRIP
+ fi
+else
-+ OBJDUMP="$ac_cv_prog_OBJDUMP"
++ STRIP="$ac_cv_prog_STRIP"
+fi
-
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
--{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
++
++fi
++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.
+@@ -2737,7 +2704,6 @@
+
+
+
+-
+ { $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.
+@@ -2807,7 +2773,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo this is the am__doit target
++ @echo done
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -2818,24 +2784,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
+-case `$am_make -s -f confmf 2> /dev/null` in #(
+-*the\ am__doit\ target*)
+- am__include=include
+- am__quote=
+- _am_result=GNU
+- ;;
+-esac
++# 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
+- case `$am_make -s -f confmf 2> /dev/null` in #(
+- *the\ am__doit\ target*)
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- ;;
+- esac
++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ fi
+ fi
+
+
+@@ -3824,11 +3790,6 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+- am__universal=false
+- case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac
+-
+ 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
+@@ -3846,17 +3807,7 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- # 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. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+ case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -3866,23 +3817,19 @@
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+ 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=$am__obj \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ $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 $am__obj 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
+@@ -5308,11 +5255,6 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+- am__universal=false
+- case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac
+-
+ 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
+@@ -5330,17 +5272,7 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- # 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. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+ case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -5350,23 +5282,19 @@
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+ 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=$am__obj \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ $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 $am__obj 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
+@@ -6912,13 +6840,13 @@
else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -6919,6 +7201,12 @@ mingw* | pw32*)
- 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_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6915: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6843: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6918: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6846: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6921: output\"" >&5)
++ (eval echo "\"\$as_me:6849: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7385,7 +7313,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7056,8 +7344,8 @@ tpf*)
- esac
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-+{ $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
-@@ -7076,10 +7364,10 @@ test -z "$deplibs_check_method" && depli
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -7092,7 +7380,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7103,11 +7391,11 @@ fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+$as_echo "$AR" >&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
-
-
-@@ -7116,10 +7404,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
--{ 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_AR+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -7132,7 +7420,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7143,11 +7431,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&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
-
- if test "x$ac_ct_AR" = x; then
-@@ -7155,12 +7443,8 @@ fi
+
+-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
- 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 at 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 at 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
- AR=$ac_ct_AR
-@@ -7185,10 +7469,10 @@ 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
--{ 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_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -7201,7 +7485,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7212,11 +7496,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&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
-
-
-@@ -7225,10 +7509,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
--{ 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_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -7241,7 +7525,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7252,11 +7536,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&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
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -7264,12 +7548,8 @@ fi
- 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 at 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 at 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
- STRIP=$ac_ct_STRIP
-@@ -7288,10 +7568,10 @@ 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
--{ 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_RANLIB+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -7304,7 +7584,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7315,11 +7595,11 @@ fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- { echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&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
-
-
-@@ -7328,10 +7608,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
--{ 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_RANLIB+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -7344,7 +7624,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7355,11 +7635,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&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
-
- if test "x$ac_ct_RANLIB" = x; then
-@@ -7367,12 +7647,8 @@ fi
- 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 at 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 at 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
- RANLIB=$ac_ct_RANLIB
-@@ -7449,10 +7725,10 @@ compiler=$CC
-
-
- # 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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
-
- # These are sane defaults that work on at least a few old systems.
-@@ -7469,7 +7745,7 @@ case $host_os in
- aix*)
- symcode='[BCDT]'
+@@ -8120,7 +8048,7 @@
;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- symcode='[ABCDGISTW]'
- ;;
- hpux*)
-@@ -7570,14 +7846,14 @@ _LT_EOF
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 8123 "configure"' > conftest.$ac_ext
++ echo '#line 8051 "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
-+ $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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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
-@@ -7634,7 +7910,7 @@ _LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
-@@ -7669,11 +7945,11 @@ 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
-- { echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: failed" >&5
-+$as_echo "failed" >&6; }
- else
-- { echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: ok" >&5
-+$as_echo "ok" >&6; }
- fi
-
-
-@@ -7713,7 +7989,7 @@ ia64-*-hpux*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
-@@ -7728,11 +8004,11 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 7731 "configure"' > conftest.$ac_ext
-+ echo '#line 8007 "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
-+ $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
-@@ -7770,7 +8046,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
-@@ -7820,10 +8096,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- # 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -7852,26 +8128,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- lt_cv_cc_needs_belf=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
-@@ -7881,8 +8161,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- 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; }
-+{ $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"
-@@ -7894,7 +8174,7 @@ sparc*-*solaris*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
-@@ -7921,10 +8201,10 @@ need_locks="$enable_libtool_lock"
- 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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -7937,7 +8217,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7948,11 +8228,11 @@ fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
-- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--echo "${ECHO_T}$DSYMUTIL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&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
-
-
-@@ -7961,10 +8241,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
--{ 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_DSYMUTIL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -7977,7 +8257,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7988,11 +8268,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&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
-
- if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -8000,12 +8280,8 @@ fi
- 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 at 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 at 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
- DSYMUTIL=$ac_ct_DSYMUTIL
-@@ -8017,10 +8293,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
--{ 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_NMEDIT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -8033,7 +8309,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8044,11 +8320,11 @@ fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
-- { echo "$as_me:$LINENO: result: $NMEDIT" >&5
--echo "${ECHO_T}$NMEDIT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&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
-
-
-@@ -8057,10 +8333,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
--{ 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_NMEDIT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -8073,7 +8349,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8084,11 +8360,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&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
-
- if test "x$ac_ct_NMEDIT" = x; then
-@@ -8096,12 +8372,8 @@ fi
- 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 at 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 at 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
- NMEDIT=$ac_ct_NMEDIT
-@@ -8113,10 +8385,10 @@ 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
--{ 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_LIPO+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$LIPO"; then
- ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-@@ -8129,7 +8401,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_LIPO="${ac_tool_prefix}lipo"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8140,11 +8412,11 @@ fi
- fi
- LIPO=$ac_cv_prog_LIPO
- if test -n "$LIPO"; then
-- { echo "$as_me:$LINENO: result: $LIPO" >&5
--echo "${ECHO_T}$LIPO" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-+$as_echo "$LIPO" >&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
-
-
-@@ -8153,10 +8425,10 @@ 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
--{ 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_LIPO+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -8169,7 +8441,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_LIPO="lipo"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8180,11 +8452,11 @@ fi
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
--echo "${ECHO_T}$ac_ct_LIPO" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&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
-
- if test "x$ac_ct_LIPO" = x; then
-@@ -8192,12 +8464,8 @@ fi
- 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 at 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 at 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
- LIPO=$ac_ct_LIPO
-@@ -8209,10 +8477,10 @@ 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
--{ 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_OTOOL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$OTOOL"; then
- ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-@@ -8225,7 +8493,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_OTOOL="${ac_tool_prefix}otool"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8236,11 +8504,11 @@ fi
- fi
- OTOOL=$ac_cv_prog_OTOOL
- if test -n "$OTOOL"; then
-- { echo "$as_me:$LINENO: result: $OTOOL" >&5
--echo "${ECHO_T}$OTOOL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&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
-
-
-@@ -8249,10 +8517,10 @@ 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
--{ 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_OTOOL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -8265,7 +8533,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_OTOOL="otool"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8276,11 +8544,11 @@ fi
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
--echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+$as_echo "$ac_ct_OTOOL" >&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
-
- if test "x$ac_ct_OTOOL" = x; then
-@@ -8288,12 +8556,8 @@ fi
- 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 at 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 at 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
- OTOOL=$ac_ct_OTOOL
-@@ -8305,10 +8569,10 @@ 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
--{ 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_OTOOL64+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test -n "$OTOOL64"; then
- ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-@@ -8321,7 +8585,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_OTOOL64="${ac_tool_prefix}otool64"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8332,11 +8596,11 @@ fi
- fi
- OTOOL64=$ac_cv_prog_OTOOL64
- if test -n "$OTOOL64"; then
-- { echo "$as_me:$LINENO: result: $OTOOL64" >&5
--echo "${ECHO_T}$OTOOL64" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+$as_echo "$OTOOL64" >&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
-
-
-@@ -8345,10 +8609,10 @@ 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
--{ 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_OTOOL64+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $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.
-@@ -8361,7 +8625,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_OTOOL64="otool64"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -8372,11 +8636,11 @@ fi
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
--echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+$as_echo "$ac_ct_OTOOL64" >&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
-
- if test "x$ac_ct_OTOOL64" = x; then
-@@ -8384,12 +8648,8 @@ fi
- 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 at 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 at 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
- OTOOL64=$ac_ct_OTOOL64
-@@ -8424,10 +8684,10 @@ fi
-
-
-
-- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-@@ -8451,12 +8711,12 @@ else
- rm -f conftest.*
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
-@@ -8483,33 +8743,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- lt_cv_ld_exported_symbols_list=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+{ $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' ;;
-@@ -8558,11 +8822,11 @@ echo "${ECHO_T}$lt_cv_ld_exported_symbol
- 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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8580,20 +8844,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- eval "$as_ac_Header=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-@@ -8601,12 +8866,15 @@ 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
-+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 `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -8617,11 +8885,11 @@ done
-
- for ac_header in dlfcn.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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -8639,20 +8907,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- eval "$as_ac_Header=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-@@ -8660,12 +8929,15 @@ 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
-+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 `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -8843,10 +9115,10 @@ if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
--{ echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -8858,8 +9130,8 @@ else
- fi
- rmdir .libs 2>/dev/null
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
-
-
-@@ -8951,10 +9223,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
- 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -9004,11 +9276,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&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
-
-
-@@ -9017,10 +9289,10 @@ 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -9070,11 +9342,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&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
-
-
-@@ -9150,10 +9422,10 @@ 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-@@ -9168,11 +9440,11 @@ else
+@@ -9556,11 +9484,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:9171: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9443: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9175: \$? = $ac_status" >&5
-+ echo "$as_me:9447: \$? = $ac_status" >&5
+- echo "$as_me:9563: \$? = $ac_status" >&5
++ echo "$as_me:9491: \$? = $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.
-@@ -9185,8 +9457,8 @@ else
- $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; }
-+{ $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"
-@@ -9205,8 +9477,8 @@ fi
- 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; }
-+{ $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,'
-@@ -9240,7 +9512,7 @@ echo $ECHO_N "checking for $compiler opt
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ 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
-@@ -9255,10 +9527,11 @@ echo $ECHO_N "checking for $compiler opt
- ;;
-
- 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*)
- # +Z the default
- ;;
- *)
-@@ -9308,7 +9581,7 @@ echo $ECHO_N "checking for $compiler opt
- fi
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ 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'
-@@ -9338,11 +9611,25 @@ echo $ECHO_N "checking for $compiler opt
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
-- icc* | ecc* | ifort*)
-+ # 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)
-@@ -9462,8 +9749,8 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-@@ -9474,10 +9761,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&
- # 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-@@ -9492,11 +9779,11 @@ else
+@@ -9895,11 +9823,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:9495: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9782: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9898: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9826: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9499: \$? = $ac_status" >&5
-+ echo "$as_me:9786: \$? = $ac_status" >&5
+- echo "$as_me:9902: \$? = $ac_status" >&5
++ echo "$as_me:9830: \$? = $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.
-@@ -9509,8 +9796,8 @@ else
- $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; }
-+{ $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
-@@ -9533,10 +9820,10 @@ fi
- # 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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
-@@ -9561,8 +9848,8 @@ else
- 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; }
-+{ $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
- :
-@@ -9576,10 +9863,10 @@ 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
-@@ -9597,11 +9884,11 @@ else
+@@ -10000,11 +9928,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:9600: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9887: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10003: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9931: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9604: \$? = $ac_status" >&5
-+ echo "$as_me:9891: \$? = $ac_status" >&5
+- echo "$as_me:10007: \$? = $ac_status" >&5
++ echo "$as_me:9935: \$? = $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
-@@ -9623,18 +9910,18 @@ else
- $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; }
-+{ $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: 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; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
-@@ -9652,11 +9939,11 @@ else
+@@ -10055,11 +9983,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:9655: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9942: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9986: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9659: \$? = $ac_status" >&5
-+ echo "$as_me:9946: \$? = $ac_status" >&5
+- echo "$as_me:10062: \$? = $ac_status" >&5
++ echo "$as_me:9990: \$? = $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
-@@ -9678,8 +9965,8 @@ else
- $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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-@@ -9687,19 +9974,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"
- 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; }
-+ { $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: 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
-@@ -9711,8 +9998,8 @@ 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; }
-+ { $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=
-@@ -9756,7 +10043,7 @@ echo $ECHO_N "checking whether the $comp
- extract_expsyms_cmds=
-
- 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++.
-@@ -9771,6 +10058,9 @@ echo $ECHO_N "checking whether the $comp
+@@ -10174,6 +10102,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -7949,4142 +1949,85 @@
esac
ld_shlibs=yes
-@@ -9843,7 +10133,7 @@ _LT_EOF
+@@ -10356,7 +10287,7 @@
fi
;;
-- cygwin* | mingw* | pw32*)
-+ 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'
-@@ -9909,6 +10199,9 @@ _LT_EOF
- 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= ;;
-@@ -10141,6 +10434,7 @@ _LT_EOF
+- 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=
+@@ -10531,6 +10462,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
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=yes
-@@ -10171,18 +10465,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -10197,12 +10494,13 @@ 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
-+ $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
-@@ -10238,18 +10536,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -10264,12 +10565,13 @@ 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
-+ $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
-@@ -10307,7 +10609,7 @@ if test -z "$aix_libpath"; then aix_libp
- export_dynamic_flag_spec=-rdynamic
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10945,7 +10877,7 @@
+ link_all_deplibs=yes
;;
-- 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
-@@ -10338,7 +10640,11 @@ if test -z "$aix_libpath"; then aix_libp
- whole_archive_flag_spec=''
- link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
-- if test "$GCC" = "yes"; then
-+ 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}"
-@@ -10430,7 +10736,7 @@ if test -z "$aix_libpath"; then aix_libp
- 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}+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'
-@@ -10488,27 +10794,31 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_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
-- echo "$as_me: failed program was:" >&5
-+ $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"
-@@ -10766,8 +11076,8 @@ rm -f core conftest.err conftest.$ac_obj
- fi
+- 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
+@@ -11907,13 +11839,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # 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
--{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6; }
-+{ $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
-@@ -10803,15 +11113,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.
-- { 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; }
-+ { $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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -10829,7 +11139,7 @@ echo $ECHO_N "checking whether -lc shoul
- 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
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc=no
-@@ -10841,8 +11151,8 @@ echo $ECHO_N "checking whether -lc shoul
- 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; }
-+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
- ;;
- esac
- fi
-@@ -11005,8 +11315,8 @@ esac
-
-
-
-- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+ { $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
-@@ -11168,14 +11478,14 @@ bsdi[45]*)
- # libtool to hard-code these into programs
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11925,6 +11854,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
++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
-
- 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}`~
-@@ -11198,7 +11508,7 @@ cygwin* | mingw* | pw32*)
- 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"`
-@@ -11448,29 +11758,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_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
-- echo "$as_me: failed program was:" >&5
-+ $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
-@@ -11679,7 +11993,7 @@ tpf*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-- library_name_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}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-@@ -11696,8 +12010,8 @@ uts4*)
- 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
-
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -11798,8 +12112,8 @@ 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; }
-+ { $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" ||
-@@ -11823,8 +12137,8 @@ else
- # directories.
- hardcode_action=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
-
- if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
-@@ -11856,7 +12170,7 @@ else
- lt_cv_dlopen_self=yes
- ;;
-
-- mingw* | pw32*)
-+ mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-@@ -11868,10 +12182,10 @@ else
-
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -11903,33 +12217,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dl_dlopen=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-
-@@ -11942,10 +12260,10 @@ fi
- ;;
-
- *)
-- { echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -11998,38 +12316,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_shl_load=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -12061,39 +12383,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dld_shl_load=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-- { echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -12146,38 +12472,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_dlopen=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -12209,39 +12539,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dl_dlopen=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
-@@ -12273,39 +12607,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_svld_dlopen=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -12337,33 +12675,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dld_dld_link=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ 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
-+{ $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
-
-@@ -12402,10 +12744,10 @@ fi
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-@@ -12413,7 +12755,7 @@ else
+@@ -12858,7 +12799,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12416 "configure"
-+#line 12758 "configure"
+-#line 12861 "configure"
++#line 12802 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12454,10 +12796,6 @@ else
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -12473,13 +12811,13 @@ int main ()
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }
- _LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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=$?
-@@ -12497,15 +12835,15 @@ rm -fr conftest*
-
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+{ $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\"
-- { 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-@@ -12513,7 +12851,7 @@ else
+@@ -12954,7 +12895,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12516 "configure"
-+#line 12854 "configure"
+-#line 12957 "configure"
++#line 12898 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12554,10 +12892,6 @@ else
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -12573,13 +12907,13 @@ int main ()
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }
- _LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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=$?
-@@ -12597,8 +12931,8 @@ rm -fr conftest*
-
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
-@@ -12636,13 +12970,13 @@ 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; }
-+{ $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"
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $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
-@@ -12650,16 +12984,16 @@ else
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&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
- ;;
- *)
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- ;;
- esac
- fi
-@@ -12676,13 +13010,13 @@ 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; }
-+ { $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 whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&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
-@@ -12702,15 +13036,15 @@ echo $ECHO_N "checking whether to build
- fi
- ;;
- esac
-- { echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$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; }
-+ { $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
-- { echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
-
-
-
-@@ -12747,68 +13081,14 @@ CC="$lt_save_CC"
-
- #### Integer sizes
-
--{ echo "$as_me:$LINENO: checking for char" >&5
--echo $ECHO_N "checking for char... $ECHO_C" >&6; }
--if test "${ac_cv_type_char+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
--typedef char ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_char=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_char=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
--echo "${ECHO_T}$ac_cv_type_char" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of char" >&5
--echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of char" >&5
-+$as_echo_n "checking size of char... " >&6; }
- if test "${ac_cv_sizeof_char+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -12819,11 +13099,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -12836,13 +13115,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -12856,11 +13136,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -12873,20 +13152,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -12900,7 +13180,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12910,11 +13190,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -12927,13 +13206,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -12947,11 +13227,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -12964,20 +13243,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -12991,7 +13271,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -13011,11 +13291,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13028,20 +13307,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -13052,11 +13332,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_char=$ac_lo;;
- '') if test "$ac_cv_type_char" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+ { { $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 sizeof (char)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char)
-+$as_echo "$as_me: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_char=0
- fi ;;
-@@ -13069,9 +13351,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef char ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (char)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (char)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -13081,20 +13362,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (char))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (char))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (char))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -13107,43 +13390,48 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_char=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_char" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+ { { $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 sizeof (char)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char)
-+$as_echo "$as_me: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_char=0
- 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
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
--echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-+$as_echo "$ac_cv_sizeof_char" >&6; }
-
-
-
-@@ -13152,68 +13440,14 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6; }
--if test "${ac_cv_type_short+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
--typedef short ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_short=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_short=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-+$as_echo_n "checking size of short... " >&6; }
- if test "${ac_cv_sizeof_short+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -13224,11 +13458,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -13241,13 +13474,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -13261,11 +13495,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13278,20 +13511,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -13305,7 +13539,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13315,11 +13549,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -13332,13 +13565,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -13352,11 +13586,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13369,20 +13602,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -13396,7 +13630,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -13416,11 +13650,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13433,20 +13666,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -13457,11 +13691,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
- '') if test "$ac_cv_type_short" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+ { { $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 sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+$as_echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_short=0
- fi ;;
-@@ -13474,9 +13710,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (short)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -13486,20 +13721,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (short))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (short))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (short))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -13512,43 +13749,48 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_short" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+ { { $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 sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+$as_echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_short=0
- 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
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-
-@@ -13557,68 +13799,14 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6; }
--if test "${ac_cv_type_long+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
--typedef long ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_long=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_long=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -13629,11 +13817,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -13646,13 +13833,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -13666,11 +13854,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13683,20 +13870,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -13710,7 +13898,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13720,11 +13908,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -13737,13 +13924,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -13757,11 +13945,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13774,20 +13961,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -13801,7 +13989,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -13821,11 +14009,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -13838,20 +14025,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -13862,11 +14050,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
- '') if test "$ac_cv_type_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+ { { $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 sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+$as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_long=0
- fi ;;
-@@ -13879,9 +14069,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (long)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -13891,20 +14080,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (long))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (long))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (long))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -13917,113 +14108,64 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+ { { $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 sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+$as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_long=0
-- fi
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_LONG $ac_cv_sizeof_long
--_ACEOF
--
--
--{ echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6; }
--if test "${ac_cv_type_int+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
--typedef int ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_int=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_int=no
-+ { (exit 77); exit 77; }; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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 conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-+$as_echo_n "checking size of int... " >&6; }
- if test "${ac_cv_sizeof_int+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -14034,11 +14176,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -14051,13 +14192,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14071,11 +14213,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14088,20 +14229,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -14115,7 +14257,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14125,11 +14267,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -14142,13 +14283,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14162,11 +14304,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14179,20 +14320,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -14206,7 +14348,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -14226,11 +14368,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14243,20 +14384,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -14267,11 +14409,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
- '') if test "$ac_cv_type_int" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+ { { $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 sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+$as_echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int=0
- fi ;;
-@@ -14284,9 +14428,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -14296,20 +14439,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (int))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (int))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (int))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -14322,43 +14467,48 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_int" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+ { { $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 sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+$as_echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int=0
- 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
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-@@ -14367,68 +14517,14 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for void *" >&5
--echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
--if test "${ac_cv_type_void_p+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
--typedef void * ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_void_p=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_void_p=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
--echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of void *" >&5
--echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
- if test "${ac_cv_sizeof_void_p+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -14439,11 +14535,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -14456,13 +14551,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14476,11 +14572,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14493,20 +14588,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -14520,7 +14616,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14530,11 +14626,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -14547,13 +14642,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14567,11 +14663,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14584,20 +14679,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -14611,7 +14707,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -14631,11 +14727,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14648,20 +14743,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -14672,11 +14768,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_void_p=$ac_lo;;
- '') if test "$ac_cv_type_void_p" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
-+ { { $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 sizeof (void *)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *)
-+$as_echo "$as_me: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_void_p=0
- fi ;;
-@@ -14689,9 +14787,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void * ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (void *)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -14701,20 +14798,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (void *))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (void *))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (void *))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -14727,43 +14826,48 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_void_p=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_void_p" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
-+ { { $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 sizeof (void *)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *)
-+$as_echo "$as_me: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_void_p=0
- 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
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
--echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-
-
-
-@@ -14772,68 +14876,14 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
--if test "${ac_cv_type_long_long+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
--typedef long long ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type_long_long=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_long_long=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of long long" >&5
--echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-+$as_echo_n "checking size of long long... " >&6; }
- if test "${ac_cv_sizeof_long_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -14844,11 +14894,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -14861,13 +14910,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14881,11 +14931,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14898,20 +14947,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -14925,7 +14975,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -14935,11 +14985,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -14952,13 +15001,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -14972,11 +15022,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -14989,20 +15038,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -15016,7 +15066,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -15036,11 +15086,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -15053,20 +15102,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -15077,11 +15127,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
- '') if test "$ac_cv_type_long_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+ { { $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 sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+$as_echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_long_long=0
- fi ;;
-@@ -15094,9 +15146,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (long long)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -15106,20 +15157,22 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (long long))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (long long))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (long long))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
-@@ -15132,43 +15185,48 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long_long=`cat conftest.val`
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- if test "$ac_cv_type_long_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+ { { $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 sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+$as_echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_long_long=0
- 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
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
-
-
-
-@@ -15177,68 +15235,14 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for __int64" >&5
--echo $ECHO_N "checking for __int64... $ECHO_C" >&6; }
--if test "${ac_cv_type___int64+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
--typedef __int64 ac__type_new_;
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
-- return 0;
--if (sizeof (ac__type_new_))
-- 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_type___int64=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type___int64=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
--echo "${ECHO_T}$ac_cv_type___int64" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of __int64" >&5
--echo $ECHO_N "checking size of __int64... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of __int64" >&5
-+$as_echo_n "checking size of __int64... " >&6; }
- if test "${ac_cv_sizeof___int64+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-@@ -15249,11 +15253,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -15266,13 +15269,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -15286,11 +15290,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -15303,20 +15306,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
-@@ -15330,7 +15334,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15340,11 +15344,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -15357,13 +15360,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-@@ -15377,11 +15381,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -15394,20 +15397,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_lo=$ac_mid; break
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -15421,7 +15425,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-@@ -15441,11 +15445,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -15458,20 +15461,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_hi=$ac_mid
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -15482,11 +15486,13 @@ done
- case $ac_lo in
- ?*) ac_cv_sizeof___int64=$ac_lo;;
- '') if test "$ac_cv_type___int64" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
-+ { { $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 sizeof (__int64)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
-+$as_echo "$as_me: error: cannot compute sizeof (__int64)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof___int64=0
- fi ;;
-@@ -15499,9 +15505,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (__int64)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (__int64)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -15511,101 +15516,254 @@ main ()
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ if (((long int) (sizeof (__int64))) < 0)
- {
- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (__int64))))
- return 1;
-- fprintf (f, "%ld\n", i);
-+ fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ if (i != ((long int) (sizeof (__int64))))
- return 1;
-- fprintf (f, "%lu\n", i);
-+ fprintf (f, "%lu", i);
- }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
-+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
-+ ac_cv_sizeof___int64=`cat conftest.val`
-+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 )
-+if test "$ac_cv_type___int64" = 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 compute sizeof (__int64)
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: cannot compute sizeof (__int64)
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }; }
-+ else
-+ ac_cv_sizeof___int64=0
-+ 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
-+rm -f conftest.val
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
-+$as_echo "$ac_cv_sizeof___int64" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF___INT64 $ac_cv_sizeof___int64
-+_ACEOF
-+
-+
-+
-+## byte order
-+
-+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_cv_c_bigendian=unknown
-+ # See if we're dealing with a universal compiler.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifndef __APPLE_CC__
-+ not a universal capable compiler
-+ #endif
-+ typedef int dummy;
-+
-+_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
-+
-+ # Check for potential -arch flags. It is not universal unless
-+ # there are some -arch flags. Note that *ppc* also matches
-+ # ppc64. This check is also rather less than ideal.
-+ case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
-+ *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-+ esac
-+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
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+ 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/param.h>
-+
-+int
-+main ()
-+{
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+ && LITTLE_ENDIAN)
-+ bogus endian macros
-+ #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 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
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
-+ 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/param.h>
-+
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+ #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_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
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof___int64=`cat conftest.val`
-+ 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_bigendian=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--( exit $ac_status )
--if test "$ac_cv_type___int64" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof___int64=0
-- fi
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
-+ ac_cv_c_bigendian=no
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
--echo "${ECHO_T}$ac_cv_sizeof___int64" >&6; }
--
-
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF___INT64 $ac_cv_sizeof___int64
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+fi
-
--## byte order
--{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
--if test "${ac_cv_c_bigendian+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # See if sys/param.h defines the BYTE_ORDER macro.
--cat >conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-+ 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/param.h>
-+#include <limits.h>
-
- int
- main ()
- {
--#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-- && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-- bogus endian macros
--#endif
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+ bogus endian macros
-+ #endif
-
- ;
- return 0;
-@@ -15617,33 +15775,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
-- # It does; now see whether it defined to BIG_ENDIAN or not.
--cat >conftest.$ac_ext <<_ACEOF
-+ # It does; now see whether it defined to _BIG_ENDIAN or not.
-+ 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/param.h>
-+#include <limits.h>
-
- int
- main ()
- {
--#if BYTE_ORDER != BIG_ENDIAN
-- not big endian
--#endif
-+#ifndef _BIG_ENDIAN
-+ not big endian
-+ #endif
-
- ;
- return 0;
-@@ -15655,20 +15813,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_c_bigendian=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
-@@ -15676,29 +15835,44 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- # It does not; compile a test program.
--if test "$cross_compiling" = yes; then
-- # try to guess the endianness by grepping values into an object file
-- ac_cv_c_bigendian=unknown
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # Compile a test program.
-+ if test "$cross_compiling" = yes; then
-+ # Try to guess by grepping values from an object file.
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
--void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
--void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+short int ascii_mm[] =
-+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+ short int ascii_ii[] =
-+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+ int use_ascii (int i) {
-+ return ascii_mm[i] + ascii_ii[i];
-+ }
-+ short int ebcdic_ii[] =
-+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+ short int ebcdic_mm[] =
-+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+ int use_ebcdic (int i) {
-+ return ebcdic_mm[i] + ebcdic_ii[i];
-+ }
-+ extern int foo;
-+
- int
- main ()
- {
-- _ascii (); _ebcdic ();
-+return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
- }
-@@ -15709,30 +15883,31 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
-- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-- ac_cv_c_bigendian=yes
--fi
--if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-- if test "$ac_cv_c_bigendian" = unknown; then
-- ac_cv_c_bigendian=no
-- else
-- # finding both strings is unlikely to happen, but who knows?
-- ac_cv_c_bigendian=unknown
-- fi
--fi
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-+ ac_cv_c_bigendian=yes
-+ fi
-+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
-+ fi
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -15751,14 +15926,14 @@ int
- main ()
- {
-
-- /* Are we little or big endian? From Harbison&Steele. */
-- union
-- {
-- long int l;
-- char c[sizeof (long int)];
-- } u;
-- u.l = 1;
-- return u.c[sizeof (long int) - 1] == 1;
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long int l;
-+ char c[sizeof (long int)];
-+ } u;
-+ u.l = 1;
-+ return u.c[sizeof (long int) - 1] == 1;
-
- ;
- return 0;
-@@ -15770,55 +15945,62 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ $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 )
- ac_cv_c_bigendian=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
-
-
-+ fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
--case $ac_cv_c_bigendian in
-- yes)
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+$as_echo "$ac_cv_c_bigendian" >&6; }
-+ case $ac_cv_c_bigendian in #(
-+ yes)
-+ cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+;; #(
-+ no)
-+ ;; #(
-+ universal)
-
- cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
-+#define AC_APPLE_UNIVERSAL_BUILD 1
- _ACEOF
-- ;;
-- no)
-- ;;
-- *)
-- { { echo "$as_me:$LINENO: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--echo "$as_me: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+
-+ ;; #(
-+ *)
-+ { { $as_echo "$as_me:$LINENO: error: unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+$as_echo "$as_me: error: unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
-+ esac
-
-
- #### Warnings
-@@ -15860,11 +16042,6 @@ if test "x$GCC" = "xyes"; then
+@@ -16557,11 +16498,6 @@
esac
case " $CFLAGS " in
@@ -12096,5846 +2039,419 @@
*[\ \ ]-Wsign-compare[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wsign-compare" ;;
esac
-@@ -15969,20 +16146,21 @@ fi
-
- for ac_header in execinfo.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-- { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -15998,32 +16176,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$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; }
-+{ $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
-@@ -16037,51 +16216,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: 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;}
-+ { $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: 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;}
-+ { $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=metacity ##
-@@ -16090,30 +16270,33 @@ _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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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; }
-+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
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+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 `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- for ac_func in backtrace
- 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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -16166,35 +16349,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- eval "$as_ac_var=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $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 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
-+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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -16209,20 +16399,21 @@ done
-
- for ac_header in locale.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-- { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -16238,32 +16429,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$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; }
-+{ $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
-@@ -16277,51 +16469,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: 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;}
-+ { $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: 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;}
-+ { $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=metacity ##
-@@ -16330,21 +16523,24 @@ _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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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; }
-+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
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+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 `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -16352,10 +16548,10 @@ 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -16378,31 +16574,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- am_cv_val_LC_MESSAGES=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-+{ $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
-@@ -16421,17 +16621,17 @@ _ACEOF
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
-+{ $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?
--{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
--echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
-+{ $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
-@@ -16447,32 +16647,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$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; }
-+{ $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
-@@ -16486,51 +16687,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: 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;}
-+ { $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:* )
-- { 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;}
-+ { $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=metacity ##
-@@ -16539,28 +16741,28 @@ _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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+$as_echo "$ac_cv_header_libintl_h" >&6; }
-
- fi
--if test $ac_cv_header_libintl_h = yes; then
-+if test "x$ac_cv_header_libintl_h" = x""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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -16585,38 +16787,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- gt_cv_func_ngettext_libc=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
-+{ $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
-- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -16641,43 +16847,47 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- gt_cv_func_dgettext_libc=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+$as_echo "$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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -16730,35 +16940,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- eval "$as_ac_var=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $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 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
-+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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -16773,10 +16990,10 @@ done
- || 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -16808,37 +17025,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_intl_bindtextdomain=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -16870,37 +17091,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_intl_ngettext=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
-@@ -16932,33 +17157,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_intl_dgettext=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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
- fi
-
-@@ -16968,14 +17197,14 @@ 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -17007,37 +17236,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_intl_ngettext=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
- 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -17069,33 +17302,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_intl_dcgettext=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
- 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
-+{ $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
-@@ -17120,11 +17357,11 @@ fi
-
- 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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -17177,35 +17414,42 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- eval "$as_ac_var=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $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 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
-+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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -17241,10 +17485,10 @@ _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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case "$MSGFMT" in
- /*)
-@@ -17268,11 +17512,11 @@ esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&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
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
-@@ -17280,11 +17524,11 @@ fi
-
- 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; }
-+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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -17337,43 +17581,50 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- eval "$as_ac_var=yes"
- else
-- echo "$as_me: failed program was:" >&5
-+ $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 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
-+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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_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; }
-+ { $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 ""
-@@ -17387,25 +17638,25 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+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=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_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; }
-+ 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
--{ 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_path_GMSGFMT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
-@@ -17420,7 +17671,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -17433,20 +17684,20 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&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
-
-
- # 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case "$XGETTEXT" in
- /*)
-@@ -17470,11 +17721,11 @@ esac
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&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
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -17499,30 +17750,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -17575,32 +17829,36 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_bind_textdomain_codeset=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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
-@@ -17616,6 +17874,7 @@ 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"
-@@ -17641,8 +17900,8 @@ _ACEOF
- 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; }
-+ { $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
-@@ -17674,8 +17933,8 @@ echo "${ECHO_T}found xgettext program is
- 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; }
-+ { $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
-@@ -17699,8 +17958,8 @@ echo $ECHO_N "checking for catalogs to b
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- { echo "$as_me:$LINENO: result: $LINGUAS" >&5
--echo "${ECHO_T}$LINGUAS" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+$as_echo "$LINGUAS" >&6; }
- fi
-
- if test -n "$LINGUAS"; then
-@@ -17740,10 +17999,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
--{ 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_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -17758,7 +18017,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -17770,11 +18029,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&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
-
-
-@@ -17783,10 +18042,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
--{ 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_path_ac_pt_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -17801,7 +18060,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -17813,11 +18072,11 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&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
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -17825,12 +18084,8 @@ fi
- 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 at 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 at 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
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-@@ -17842,32 +18097,32 @@ 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; }
-+ { $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
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&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; }
- PKG_CONFIG=""
- fi
-
- fi
-
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for ALL" >&5
--echo $ECHO_N "checking for ALL... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for ALL" >&5
-+$as_echo_n "checking for ALL... " >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$ALL_CFLAGS"; then
- pkg_cv_ALL_CFLAGS="$ALL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
+@@ -18511,10 +18447,11 @@
+ { $as_echo "$as_me:$LINENO: checking for ALL" >&5
+ $as_echo_n "checking for ALL... " >&6; }
+
+-if test -n "$ALL_CFLAGS"; then
+- pkg_cv_ALL_CFLAGS="$ALL_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALL_CFLAGS"; then
++ pkg_cv_ALL_CFLAGS="$ALL_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18524,13 +18461,15 @@
else
-@@ -17882,10 +18137,10 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_ALL_LIBS="$ALL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$ALL_LIBS"; then
+- pkg_cv_ALL_LIBS="$ALL_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ALL_LIBS"; then
++ pkg_cv_ALL_LIBS="$ALL_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18540,8 +18479,9 @@
else
-@@ -17913,7 +18168,7 @@ fi
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18554,9 +18494,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.6.0" 2>&1`
++ ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.6.0"`
+ else
+- ALL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.6.0" 2>&1`
++ ALL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.6.0"`
+ fi
# Put the nasty error message in config.log where it belongs
echo "$ALL_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6.0) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6.0) were not met:
-
- $ALL_PKG_ERRORS
-
-@@ -17924,7 +18179,7 @@ Alternatively, you may set the environme
- and ALL_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.6.0) were not met:
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.6.0) were not met:
-
- $ALL_PKG_ERRORS
-
-@@ -17937,7 +18192,9 @@ See the pkg-config man page for more det
- " >&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
-+ { { $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.
-
-@@ -17947,7 +18204,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
--echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+$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.
-
-@@ -17957,29 +18214,29 @@ 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
- ALL_CFLAGS=$pkg_cv_ALL_CFLAGS
- ALL_LIBS=$pkg_cv_ALL_LIBS
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- :
- fi
- # gtk_window_set_icon_name requires gtk2+-2.60
-
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for METACITY_MESSAGE" >&5
--echo $ECHO_N "checking for METACITY_MESSAGE... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for METACITY_MESSAGE" >&5
-+$as_echo_n "checking for METACITY_MESSAGE... " >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$METACITY_MESSAGE_CFLAGS"; then
- pkg_cv_METACITY_MESSAGE_CFLAGS="$METACITY_MESSAGE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+@@ -18621,10 +18561,11 @@
+ { $as_echo "$as_me:$LINENO: checking for MUTTER_MESSAGE" >&5
+ $as_echo_n "checking for MUTTER_MESSAGE... " >&6; }
+
+-if test -n "$MUTTER_MESSAGE_CFLAGS"; then
+- pkg_cv_MUTTER_MESSAGE_CFLAGS="$MUTTER_MESSAGE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_MESSAGE_CFLAGS"; then
++ pkg_cv_MUTTER_MESSAGE_CFLAGS="$MUTTER_MESSAGE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_MESSAGE_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18634,13 +18575,15 @@
else
-@@ -17994,10 +18251,10 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MUTTER_MESSAGE_LIBS"; then
+- pkg_cv_MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_MESSAGE_LIBS"; then
++ pkg_cv_MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_MESSAGE_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18650,8 +18593,9 @@
else
-@@ -18025,7 +18282,7 @@ fi
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18664,9 +18608,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MUTTER_MESSAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.6.0" 2>&1`
++ MUTTER_MESSAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+ else
+- MUTTER_MESSAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.6.0" 2>&1`
++ MUTTER_MESSAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$METACITY_MESSAGE_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-
- $METACITY_MESSAGE_PKG_ERRORS
-
-@@ -18036,7 +18293,7 @@ Alternatively, you may set the environme
- and METACITY_MESSAGE_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 (gtk+-2.0 >= 2.6.0) were not met:
-+$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-
- $METACITY_MESSAGE_PKG_ERRORS
-
-@@ -18049,7 +18306,9 @@ See the pkg-config man page for more det
- " >&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
-+ { { $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.
-
-@@ -18059,7 +18318,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
--echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+$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.
-
-@@ -18069,28 +18328,28 @@ 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
- METACITY_MESSAGE_CFLAGS=$pkg_cv_METACITY_MESSAGE_CFLAGS
- METACITY_MESSAGE_LIBS=$pkg_cv_METACITY_MESSAGE_LIBS
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- :
- fi
-
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for METACITY_WINDOW_DEMO" >&5
--echo $ECHO_N "checking for METACITY_WINDOW_DEMO... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for METACITY_WINDOW_DEMO" >&5
-+$as_echo_n "checking for METACITY_WINDOW_DEMO... " >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$METACITY_WINDOW_DEMO_CFLAGS"; then
- pkg_cv_METACITY_WINDOW_DEMO_CFLAGS="$METACITY_WINDOW_DEMO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+ echo "$MUTTER_MESSAGE_PKG_ERRORS" >&5
+@@ -18730,10 +18674,11 @@
+ { $as_echo "$as_me:$LINENO: checking for MUTTER_WINDOW_DEMO" >&5
+ $as_echo_n "checking for MUTTER_WINDOW_DEMO... " >&6; }
+
+-if test -n "$MUTTER_WINDOW_DEMO_CFLAGS"; then
+- pkg_cv_MUTTER_WINDOW_DEMO_CFLAGS="$MUTTER_WINDOW_DEMO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_WINDOW_DEMO_CFLAGS"; then
++ pkg_cv_MUTTER_WINDOW_DEMO_CFLAGS="$MUTTER_WINDOW_DEMO_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_WINDOW_DEMO_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18743,13 +18688,15 @@
else
-@@ -18105,10 +18364,10 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MUTTER_WINDOW_DEMO_LIBS"; then
+- pkg_cv_MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_WINDOW_DEMO_LIBS"; then
++ pkg_cv_MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_WINDOW_DEMO_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+@@ -18759,8 +18706,9 @@
else
-@@ -18136,7 +18395,7 @@ fi
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18773,9 +18721,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MUTTER_WINDOW_DEMO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.6.0" 2>&1`
++ MUTTER_WINDOW_DEMO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+ else
+- MUTTER_WINDOW_DEMO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.6.0" 2>&1`
++ MUTTER_WINDOW_DEMO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$METACITY_WINDOW_DEMO_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-
- $METACITY_WINDOW_DEMO_PKG_ERRORS
-
-@@ -18147,7 +18406,7 @@ Alternatively, you may set the environme
- and METACITY_WINDOW_DEMO_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 (gtk+-2.0 >= 2.6.0) were not met:
-+$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.6.0) were not met:
-
- $METACITY_WINDOW_DEMO_PKG_ERRORS
-
-@@ -18160,7 +18419,9 @@ See the pkg-config man page for more det
- " >&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
-+ { { $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.
-
-@@ -18170,7 +18431,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
--echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+$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.
-
-@@ -18180,20 +18441,20 @@ 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; }; }; }
+ echo "$MUTTER_WINDOW_DEMO_PKG_ERRORS" >&5
+@@ -18902,10 +18850,11 @@
+ { $as_echo "$as_me:$LINENO: checking for CLUTTER" >&5
+ $as_echo_n "checking for CLUTTER... " >&6; }
+
+-if test -n "$CLUTTER_CFLAGS"; then
+- pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CLUTTER_CFLAGS"; then
++ pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$CLUTTER_PACKAGE\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$CLUTTER_PACKAGE") 2>&5
+ ac_status=$?
+@@ -18915,13 +18864,15 @@
else
- METACITY_WINDOW_DEMO_CFLAGS=$pkg_cv_METACITY_WINDOW_DEMO_CFLAGS
- METACITY_WINDOW_DEMO_LIBS=$pkg_cv_METACITY_WINDOW_DEMO_LIBS
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- :
+ pkg_failed=yes
fi
-
- if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
- echo "pangoxft found"
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CLUTTER_LIBS"; then
+- pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CLUTTER_LIBS"; then
++ pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$CLUTTER_PACKAGE\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$CLUTTER_PACKAGE") 2>&5
+ ac_status=$?
+@@ -18931,8 +18882,9 @@
else
-- { { echo "$as_me:$LINENO: error: \"Pango 1.2.0 or greater based on Xft2 is required\"" >&5
--echo "$as_me: error: \"Pango 1.2.0 or greater based on Xft2 is required\"" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: \"Pango 1.2.0 or greater based on Xft2 is required\"" >&5
-+$as_echo "$as_me: error: \"Pango 1.2.0 or greater based on Xft2 is required\"" >&2;}
- { (exit 1); exit 1; }; }
+ pkg_failed=yes
fi
-
-@@ -18202,15 +18463,15 @@ GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gn
-
-
- STARTUP_NOTIFICATION_VERSION=0.7
--{ echo "$as_me:$LINENO: checking Startup notification library >= $STARTUP_NOTIFICATION_VERSION" >&5
--echo $ECHO_N "checking Startup notification library >= $STARTUP_NOTIFICATION_VERSION... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking Startup notification library >= $STARTUP_NOTIFICATION_VERSION" >&5
-+$as_echo_n "checking Startup notification library >= $STARTUP_NOTIFICATION_VERSION... " >&6; }
- if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
- have_startup_notification=yes
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18945,9 +18897,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$CLUTTER_PACKAGE" 2>&1`
++ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$CLUTTER_PACKAGE"`
+ else
+- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "$CLUTTER_PACKAGE" 2>&1`
++ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$CLUTTER_PACKAGE"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLUTTER_PKG_ERRORS" >&5
+@@ -19174,10 +19126,11 @@
+ { $as_echo "$as_me:$LINENO: checking for INTROSPECTION" >&5
+ $as_echo_n "checking for INTROSPECTION... " >&6; }
+
+-if test -n "$INTROSPECTION_CFLAGS"; then
+- pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INTROSPECTION_CFLAGS"; then
++ pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+@@ -19187,13 +19140,15 @@
else
- have_startup_notification=no
+ pkg_failed=yes
fi
--{ echo "$as_me:$LINENO: result: $have_startup_notification" >&5
--echo "${ECHO_T}$have_startup_notification" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $have_startup_notification" >&5
-+$as_echo "$have_startup_notification" >&6; }
-
- if test x$enable_startup_notification = xyes; then
- have_startup_notification=yes
-@@ -18226,7 +18487,7 @@ if test x$have_startup_notification = xy
- METACITY_PC_MODULES="$METACITY_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_STARTUP_NOTIFICATION
-+#define HAVE_STARTUP_NOTIFICATION /**/
- _ACEOF
-
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$INTROSPECTION_LIBS"; then
+- pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INTROSPECTION_LIBS"; then
++ pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+@@ -19203,8 +19158,9 @@
else
-@@ -18248,14 +18509,14 @@ else
+ pkg_failed=yes
fi
-
- if test x$have_xcomposite = xyes; then
-- { echo "$as_me:$LINENO: checking Xcomposite >= $XCOMPOSITE_VERSION" >&5
--echo $ECHO_N "checking Xcomposite >= $XCOMPOSITE_VERSION... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking Xcomposite >= $XCOMPOSITE_VERSION" >&5
-+$as_echo_n "checking Xcomposite >= $XCOMPOSITE_VERSION... " >&6; }
- if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
-- { { echo "$as_me:$LINENO: error: no. Use --disable-compositor to disable." >&5
--echo "$as_me: error: no. Use --disable-compositor to disable." >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: no. Use --disable-compositor to disable." >&5
-+$as_echo "$as_me: error: no. Use --disable-compositor to disable." >&2;}
- { (exit 1); exit 1; }; }
- fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
fi
-@@ -18278,15 +18539,15 @@ fi
- ## if no compositor, still possibly enable render
- if test x$have_xcomposite = xno; then
- XRENDER_VERSION=0.0
-- { echo "$as_me:$LINENO: checking xrender >= $XRENDER_VERSION" >&5
--echo $ECHO_N "checking xrender >= $XRENDER_VERSION... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking xrender >= $XRENDER_VERSION" >&5
-+$as_echo_n "checking xrender >= $XRENDER_VERSION... " >&6; }
- if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then
- have_xrender=yes
- else
- have_xrender=no
- fi
-- { echo "$as_me:$LINENO: result: $have_xrender" >&5
--echo "${ECHO_T}$have_xrender" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $have_xrender" >&5
-+$as_echo "$have_xrender" >&6; }
-
- if test x$enable_render = xyes; then
- have_xrender=yes
-@@ -18306,45 +18567,45 @@ fi ## have_composite
- if test x$have_xrender = xyes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_RENDER
-+#define HAVE_RENDER /**/
- _ACEOF
-
+
+
+@@ -19217,9 +19173,9 @@
+ _pkg_short_errors_supported=no
fi
-
--{ echo "$as_me:$LINENO: checking Xcursor" >&5
--echo $ECHO_N "checking Xcursor... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking Xcursor" >&5
-+$as_echo_n "checking Xcursor... " >&6; }
- if $PKG_CONFIG xcursor; then
- have_xcursor=yes
- else
- have_xcursor=no
- fi
-- { echo "$as_me:$LINENO: result: $have_xcursor" >&5
--echo "${ECHO_T}$have_xcursor" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $have_xcursor" >&5
-+$as_echo "$have_xcursor" >&6; }
-
- if test x$have_xcursor = xyes; then
- echo "Building with Xcursor"
- METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XCURSOR
-+#define HAVE_XCURSOR /**/
- _ACEOF
-
+ if test $_pkg_short_errors_supported = yes; then
+- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0" 2>&1`
++ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-introspection-1.0"`
+ else
+- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0" 2>&1`
++ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-introspection-1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$INTROSPECTION_PKG_ERRORS" >&5
+@@ -19289,10 +19245,11 @@
+ { $as_echo "$as_me:$LINENO: checking for MUTTER" >&5
+ $as_echo_n "checking for MUTTER... " >&6; }
+
+-if test -n "$MUTTER_CFLAGS"; then
+- pkg_cv_MUTTER_CFLAGS="$MUTTER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_CFLAGS"; then
++ pkg_cv_MUTTER_CFLAGS="$MUTTER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MUTTER_PC_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MUTTER_PC_MODULES") 2>&5
+ ac_status=$?
+@@ -19302,13 +19259,15 @@
+ else
+ pkg_failed=yes
fi
-
-
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for METACITY" >&5
--echo $ECHO_N "checking for METACITY... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for METACITY" >&5
-+$as_echo_n "checking for METACITY... " >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$METACITY_CFLAGS"; then
- pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$METACITY_PC_MODULES\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$METACITY_PC_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$METACITY_PC_MODULES") 2>&5
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$MUTTER_LIBS"; then
+- pkg_cv_MUTTER_LIBS="$MUTTER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MUTTER_LIBS"; then
++ pkg_cv_MUTTER_LIBS="$MUTTER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MUTTER_PC_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MUTTER_PC_MODULES") 2>&5
ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "$METACITY_PC_MODULES" 2>/dev/null`
+@@ -19318,8 +19277,9 @@
else
-@@ -18359,10 +18620,10 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_METACITY_LIBS="$METACITY_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$METACITY_PC_MODULES\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$METACITY_PC_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "$METACITY_PC_MODULES") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "$METACITY_PC_MODULES" 2>/dev/null`
- else
-@@ -18390,7 +18651,7 @@ fi
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -19332,9 +19292,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MUTTER_PC_MODULES" 2>&1`
++ MUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MUTTER_PC_MODULES"`
+ else
+- MUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MUTTER_PC_MODULES" 2>&1`
++ MUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MUTTER_PC_MODULES"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$METACITY_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements ($METACITY_PC_MODULES) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($METACITY_PC_MODULES) were not met:
-
- $METACITY_PKG_ERRORS
-
-@@ -18401,7 +18662,7 @@ Alternatively, you may set the environme
- and METACITY_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 ($METACITY_PC_MODULES) were not met:
-+$as_echo "$as_me: error: Package requirements ($METACITY_PC_MODULES) were not met:
-
- $METACITY_PKG_ERRORS
-
-@@ -18414,7 +18675,9 @@ See the pkg-config man page for more det
- " >&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
-+ { { $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.
-
-@@ -18424,7 +18687,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
--echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+$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.
-
-@@ -18434,17 +18697,17 @@ 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
- METACITY_CFLAGS=$pkg_cv_METACITY_CFLAGS
- METACITY_LIBS=$pkg_cv_METACITY_LIBS
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- :
- fi
-
--{ echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for X" >&5
-+$as_echo_n "checking for X... " >&6; }
-
-
- # Check whether --with-x was given.
-@@ -18458,11 +18721,11 @@ if test "x$with_x" = xno; then
- 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;}
-+ *\'*) { { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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
-@@ -18483,7 +18746,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; do
-+ 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
-@@ -18497,7 +18760,7 @@ _ACEOF
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
-- /usr/lib | /lib) ;;
-+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
-@@ -18558,13 +18821,14 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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
-@@ -18572,7 +18836,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- for ac_dir in $ac_x_header_dirs; do
-@@ -18613,30 +18877,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_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=
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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`
-+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; do
-+ 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
-@@ -18645,6 +18912,7 @@ 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
-@@ -18667,8 +18935,8 @@ fi
- fi # $with_x != no
-
- if test "$have_x" != yes; then
-- { echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6; }
-+ { $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.
-@@ -18678,8 +18946,8 @@ else
- 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; }
-+ { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
- if test "$no_x" = yes; then
-@@ -18700,8 +18968,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 . . . .
-- { 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; }
-+ { $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
-@@ -18726,23 +18994,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ } && 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"
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -18767,33 +19038,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ } && 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"
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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; }
-+ { $as_echo "$as_me:$LINENO: result: neither works" >&5
-+$as_echo "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
-@@ -18839,27 +19115,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- :
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
-@@ -18891,41 +19170,45 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
-@@ -18957,39 +19240,44 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
-@@ -19002,10 +19290,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.
-- { echo "$as_me:$LINENO: checking for gethostbyname" >&5
--echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19058,37 +19346,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_gethostbyname=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+$as_echo "$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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
-@@ -19120,41 +19412,45 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_nsl_gethostbyname=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
-@@ -19186,33 +19482,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_bsd_gethostbyname=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
- fi
-
-@@ -19226,10 +19526,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.
-- { echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19282,37 +19582,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_connect=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+{ $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
-- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -19344,43 +19648,47 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_socket_connect=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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
-
- # 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19433,37 +19741,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_remove=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+$as_echo "$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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
-@@ -19495,43 +19807,47 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_posix_remove=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
- 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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19584,37 +19900,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_func_shmat=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+$as_echo "$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; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
-@@ -19646,33 +19966,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_ipc_shmat=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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"
- fi
-
-@@ -19688,10 +20012,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
-- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -19723,33 +20047,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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
-+{ $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
-
-@@ -19779,10 +20107,10 @@ if test "${try_xinerama}" != no; then
- *-*-solaris*)
- # Check for solaris
- use_solaris_xinerama=yes
-- { echo "$as_me:$LINENO: checking for XineramaGetInfo in -lXext" >&5
--echo $ECHO_N "checking for XineramaGetInfo in -lXext... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo in -lXext" >&5
-+$as_echo_n "checking for XineramaGetInfo in -lXext... " >&6; }
- if test "${ac_cv_lib_Xext_XineramaGetInfo+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext $ALL_X_LIBS $LIBS"
-@@ -19814,43 +20142,47 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_Xext_XineramaGetInfo=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xext_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
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XineramaGetInfo" >&5
--echo "${ECHO_T}$ac_cv_lib_Xext_XineramaGetInfo" >&6; }
--if test $ac_cv_lib_Xext_XineramaGetInfo = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XineramaGetInfo" >&5
-+$as_echo "$ac_cv_lib_Xext_XineramaGetInfo" >&6; }
-+if test "x$ac_cv_lib_Xext_XineramaGetInfo" = x""yes; then
- use_solaris_xinerama=yes
- else
- use_solaris_xinerama=no
- fi
-
- if test "x$use_solaris_xinerama" = "xyes"; then
-- { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5
--echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -19868,20 +20200,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_header_X11_extensions_xinerama_h=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_extensions_xinerama_h=no
-@@ -19889,20 +20222,20 @@ 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
-+{ $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
- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
- fi
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_SOLARIS_XINERAMA
-+#define HAVE_SOLARIS_XINERAMA /**/
- _ACEOF
-
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XINERAMA
-+#define HAVE_XINERAMA /**/
- _ACEOF
-
- else
-@@ -19911,18 +20244,18 @@ fi
-
-
- fi
-- { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5
--echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; }
-- { echo "$as_me:$LINENO: result: $use_solaris_xinerama" >&5
--echo "${ECHO_T}$use_solaris_xinerama" >&6; };
-+ { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5
-+$as_echo_n "checking for Xinerama support on Solaris... " >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $use_solaris_xinerama" >&5
-+$as_echo "$use_solaris_xinerama" >&6; };
- ;;
- *)
- # Check for XFree
- use_xfree_xinerama=yes
-- { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
--echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; }
-+ { $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXinerama -lXext $ALL_X_LIBS $LIBS"
-@@ -19954,37 +20287,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_Xinerama_XineramaQueryExtension=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_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
--{ 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -20002,20 +20339,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_header_X11_extensions_Xinerama_h=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_extensions_Xinerama_h=no
-@@ -20023,21 +20361,21 @@ 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
-+{ $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
- X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
- fi
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XFREE_XINERAMA
-+#define HAVE_XFREE_XINERAMA /**/
- _ACEOF
-
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XINERAMA
-+#define HAVE_XINERAMA /**/
- _ACEOF
-
- else
-@@ -20049,10 +20387,10 @@ else
- use_xfree_xinerama=no
- fi
-
-- { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5
--echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; }
-- { echo "$as_me:$LINENO: result: $use_xfree_xinerama" >&5
--echo "${ECHO_T}$use_xfree_xinerama" >&6; };
-+ { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5
-+$as_echo_n "checking for Xinerama support on XFree86... " >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $use_xfree_xinerama" >&5
-+$as_echo "$use_xfree_xinerama" >&6; };
- ;;
- esac
- fi
-@@ -20061,10 +20399,10 @@ CPPFLAGS="$metacity_save_cppflags"
-
- SHAPE_LIBS=
- found_shape=no
--{ echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
--echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
-+$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
- if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext $ALL_X_LIBS $LIBS"
-@@ -20096,45 +20434,49 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_Xext_XShapeQueryExtension=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xext_XShapeQueryExtension=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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
--echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
--if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
-+$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
-+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
- if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
--echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
-+$as_echo_n "checking for X11/extensions/shape.h... " >&6; }
- if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_extensions_shape_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
-+$as_echo "$ac_cv_header_X11_extensions_shape_h" >&6; }
- else
- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking X11/extensions/shape.h usability" >&5
--echo $ECHO_N "checking X11/extensions/shape.h usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/extensions/shape.h usability" >&5
-+$as_echo_n "checking X11/extensions/shape.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20150,32 +20492,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ echo "$as_me:$LINENO: checking X11/extensions/shape.h presence" >&5
--echo $ECHO_N "checking X11/extensions/shape.h presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/extensions/shape.h presence" >&5
-+$as_echo_n "checking X11/extensions/shape.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20189,51 +20532,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: WARNING: X11/extensions/shape.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: proceeding with the compiler's result" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: X11/extensions/shape.h: in the future, the compiler will take precedence" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: present but cannot be compiled" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: check for missing prerequisite headers?" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: see the Autoconf documentation" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: proceeding with the preprocessor's result" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/shape.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/shape.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=metacity ##
-@@ -20242,18 +20586,18 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
--echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
-+$as_echo_n "checking for X11/extensions/shape.h... " >&6; }
- if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_cv_header_X11_extensions_shape_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_extensions_shape_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
-+$as_echo "$ac_cv_header_X11_extensions_shape_h" >&6; }
-
- fi
--if test $ac_cv_header_X11_extensions_shape_h = yes; then
-+if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then
- SHAPE_LIBS=-lXext found_shape=yes
- fi
-
-@@ -20267,8 +20611,8 @@ fi
-
- if test x$enable_shape = xyes; then
- if test "$found_shape" = "no"; then
-- { { echo "$as_me:$LINENO: error: --enable-shape forced and Shape not found" >&5
--echo "$as_me: error: --enable-shape forced and Shape not found" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: --enable-shape forced and Shape not found" >&5
-+$as_echo "$as_me: error: --enable-shape forced and Shape not found" >&2;}
- { (exit 1); exit 1; }; }
- exit 1
- fi
-@@ -20277,16 +20621,16 @@ fi
- if test "x$found_shape" = "xyes"; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_SHAPE
-+#define HAVE_SHAPE /**/
- _ACEOF
-
- fi
-
- found_xkb=no
--{ echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5
--echo $ECHO_N "checking for XkbQueryExtension in -lX11... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5
-+$as_echo_n "checking for XkbQueryExtension in -lX11... " >&6; }
- if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $ALL_X_LIBS $LIBS"
-@@ -20318,45 +20662,49 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_X11_XkbQueryExtension=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_X11_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
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5
--echo "${ECHO_T}$ac_cv_lib_X11_XkbQueryExtension" >&6; }
--if test $ac_cv_lib_X11_XkbQueryExtension = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5
-+$as_echo "$ac_cv_lib_X11_XkbQueryExtension" >&6; }
-+if test "x$ac_cv_lib_X11_XkbQueryExtension" = x""yes; then
- if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
--echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-+$as_echo_n "checking for X11/XKBlib.h... " >&6; }
- if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-+$as_echo "$ac_cv_header_X11_XKBlib_h" >&6; }
- else
- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking X11/XKBlib.h usability" >&5
--echo $ECHO_N "checking X11/XKBlib.h usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/XKBlib.h usability" >&5
-+$as_echo_n "checking X11/XKBlib.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20372,32 +20720,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ echo "$as_me:$LINENO: checking X11/XKBlib.h presence" >&5
--echo $ECHO_N "checking X11/XKBlib.h presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/XKBlib.h presence" >&5
-+$as_echo_n "checking X11/XKBlib.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20411,51 +20760,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: WARNING: X11/XKBlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: proceeding with the compiler's result" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: X11/XKBlib.h: in the future, the compiler will take precedence" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: present but cannot be compiled" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: check for missing prerequisite headers?" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: see the Autoconf documentation" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: proceeding with the preprocessor's result" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: X11/XKBlib.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: X11/XKBlib.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=metacity ##
-@@ -20464,18 +20814,18 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
--echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-+$as_echo_n "checking for X11/XKBlib.h... " >&6; }
- if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_cv_header_X11_XKBlib_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-+$as_echo "$ac_cv_header_X11_XKBlib_h" >&6; }
-
- fi
--if test $ac_cv_header_X11_XKBlib_h = yes; then
-+if test "x$ac_cv_header_X11_XKBlib_h" = x""yes; then
- found_xkb=yes
- fi
-
-@@ -20486,7 +20836,7 @@ fi
- if test "x$found_xkb" = "xyes"; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XKB
-+#define HAVE_XKB /**/
- _ACEOF
-
- fi
-@@ -20494,10 +20844,10 @@ fi
-
- RANDR_LIBS=
- found_randr=no
--{ echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
--echo $ECHO_N "checking for XRRUpdateConfiguration in -lXrandr... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
-+$as_echo_n "checking for XRRUpdateConfiguration in -lXrandr... " >&6; }
- if test "${ac_cv_lib_Xrandr_XRRUpdateConfiguration+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXrandr -lXrender -lXext $ALL_X_LIBS $LIBS"
-@@ -20529,37 +20879,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xrandr_XRRUpdateConfiguration=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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
--echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
--if test $ac_cv_lib_Xrandr_XRRUpdateConfiguration = yes; then
-- { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
--echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
-+$as_echo "$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
-+if test "x$ac_cv_lib_Xrandr_XRRUpdateConfiguration" = x""yes; then
-+ { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-+$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
- if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -20577,20 +20931,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_header_X11_extensions_Xrandr_h=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_extensions_Xrandr_h=no
-@@ -20598,9 +20953,9 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
--if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-+$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
-+if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then
- RANDR_LIBS=-lXrandr found_randr=yes
- fi
-
-@@ -20611,17 +20966,17 @@ fi
- if test "x$found_randr" = "xyes"; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_RANDR
-+#define HAVE_RANDR /**/
- _ACEOF
-
- fi
-
- XSYNC_LIBS=
- found_xsync=no
--{ echo "$as_me:$LINENO: checking for XSyncQueryExtension in -lXext" >&5
--echo $ECHO_N "checking for XSyncQueryExtension in -lXext... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension in -lXext" >&5
-+$as_echo_n "checking for XSyncQueryExtension in -lXext... " >&6; }
- if test "${ac_cv_lib_Xext_XSyncQueryExtension+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext $ALL_X_LIBS $LIBS"
-@@ -20653,37 +21008,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_Xext_XSyncQueryExtension=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xext_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
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XSyncQueryExtension" >&5
--echo "${ECHO_T}$ac_cv_lib_Xext_XSyncQueryExtension" >&6; }
--if test $ac_cv_lib_Xext_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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XSyncQueryExtension" >&5
-+$as_echo "$ac_cv_lib_Xext_XSyncQueryExtension" >&6; }
-+if test "x$ac_cv_lib_Xext_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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -20701,20 +21060,21 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_cv_header_X11_extensions_sync_h=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_extensions_sync_h=no
-@@ -20722,9 +21082,9 @@ 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
-+{ $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
- found_xsync=yes
- fi
-
-@@ -20738,8 +21098,8 @@ fi
-
- if test x$enable_xsync = xyes; then
- if test "$found_xsync" = "no"; then
-- { { echo "$as_me:$LINENO: error: --enable-xsync forced and XSync not found" >&5
--echo "$as_me: error: --enable-xsync forced and XSync not found" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: --enable-xsync forced and XSync not found" >&5
-+$as_echo "$as_me: error: --enable-xsync forced and XSync not found" >&2;}
- { (exit 1); exit 1; }; }
- exit 1
- fi
-@@ -20749,7 +21109,7 @@ if test "x$found_xsync" = "xyes"; then
- XSYNC_LIBS=-lXext
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XSYNC
-+#define HAVE_XSYNC /**/
- _ACEOF
-
- fi
-@@ -20765,10 +21125,10 @@ case "$METACITY_LIBS" in
- found_sm=yes
- ;;
- *)
-- { echo "$as_me:$LINENO: checking for SmcSaveYourselfDone in -lSM" >&5
--echo $ECHO_N "checking for SmcSaveYourselfDone in -lSM... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for SmcSaveYourselfDone in -lSM" >&5
-+$as_echo_n "checking for SmcSaveYourselfDone in -lSM... " >&6; }
- if test "${ac_cv_lib_SM_SmcSaveYourselfDone+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lSM $METACITY_LIBS $LIBS"
-@@ -20800,50 +21160,55 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $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
- 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_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
- ac_cv_lib_SM_SmcSaveYourselfDone=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_SM_SmcSaveYourselfDone=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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5
--echo "${ECHO_T}$ac_cv_lib_SM_SmcSaveYourselfDone" >&6; }
--if test $ac_cv_lib_SM_SmcSaveYourselfDone = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5
-+$as_echo "$ac_cv_lib_SM_SmcSaveYourselfDone" >&6; }
-+if test "x$ac_cv_lib_SM_SmcSaveYourselfDone" = x""yes; then
-
- for ac_header in X11/SM/SMlib.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
-- { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+ { $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -20859,32 +21224,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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_objext; then
- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$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; }
-+{ $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
-@@ -20898,51 +21264,52 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+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
-- echo "$as_me:$LINENO: \$? = $ac_status" >&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: failed program was:" >&5
-+ $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
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $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: 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;}
-+ { $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: 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;}
-+ { $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=metacity ##
-@@ -20951,21 +21318,24 @@ _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; }
-+{ $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 $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&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; }
-+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
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+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 `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=yes
- fi
-@@ -20983,8 +21353,8 @@ fi
-
- if test x$enable_sm = xyes; then
- if test "$found_sm" = "no"; then
-- { { echo "$as_me:$LINENO: error: --enable-sm forced and -lSM not found" >&5
--echo "$as_me: error: --enable-sm forced and -lSM not found" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: --enable-sm forced and -lSM not found" >&5
-+$as_echo "$as_me: error: --enable-sm forced and -lSM not found" >&2;}
- { (exit 1); exit 1; }; }
- exit 1
- fi
-@@ -20993,7 +21363,7 @@ fi
- if test "$found_sm" = "yes"; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_SM
-+#define HAVE_SM /**/
- _ACEOF
-
- fi
-@@ -21012,10 +21382,10 @@ HOST_ALIAS=$host_alias
-
- # 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; }
-+{ $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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $GDK_PIXBUF_CSOURCE in
- [\\/]* | ?:[\\/]*)
-@@ -21030,7 +21400,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"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -21043,18 +21413,18 @@ 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; }
-+ { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5
-+$as_echo "$GDK_PIXBUF_CSOURCE" >&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
-
-
-
- if test x"$GDK_PIXBUF_CSOURCE" = xno; then
-- { { echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5
--echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5
-+$as_echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -21063,10 +21433,10 @@ fi
- if test x$enable_gconf = xyes; then
- # Extract the first word of "gconftool-2", so it can be a program name with args.
- set dummy gconftool-2; 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_path_GCONFTOOL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $GCONFTOOL in
- [\\/]* | ?:[\\/]*)
-@@ -21081,7 +21451,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_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -21094,17 +21464,17 @@ esac
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
-- { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--echo "${ECHO_T}$GCONFTOOL" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+$as_echo "$GCONFTOOL" >&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
-
-
- if test x"$GCONFTOOL" = xno; then
-- { { echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
--echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
-+$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -21123,8 +21493,8 @@ fi
-
-
-
-- { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
--echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -21138,15 +21508,15 @@ fi
-
-
-
-- { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
--echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
- # Check whether --enable-schemas-install was given.
- if test "${enable_schemas_install+set}" = set; then
- enableval=$enable_schemas_install; case ${enableval} in
- yes|no) ;;
-- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
--echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-+ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-+$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- fi
-@@ -21167,10 +21537,10 @@ fi
-
- # Extract the first word of "zenity", so it can be a program name with args.
- set dummy zenity; 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_path_ZENITY+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $ZENITY in
- [\\/]* | ?:[\\/]*)
-@@ -21185,7 +21555,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_ZENITY="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -21198,17 +21568,17 @@ esac
- fi
- ZENITY=$ac_cv_path_ZENITY
- if test -n "$ZENITY"; then
-- { echo "$as_me:$LINENO: result: $ZENITY" >&5
--echo "${ECHO_T}$ZENITY" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $ZENITY" >&5
-+$as_echo "$ZENITY" >&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
-
-
- if test x"$ZENITY" = xno; then
-- { { echo "$as_me:$LINENO: error: zenity not found in your path - needed for dialogs" >&5
--echo "$as_me: error: zenity not found in your path - needed for dialogs" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: zenity not found in your path - needed for dialogs" >&5
-+$as_echo "$as_me: error: zenity not found in your path - needed for dialogs" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -21233,10 +21603,10 @@ fi
- gdu_cv_version_required=0.8.0
-
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- gdu_cv_have_gdu=yes
- else
-@@ -21246,8 +21616,8 @@ fi
- if test "$gdu_cv_have_gdu" = "yes"; then
- :
- else
-- { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
--echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-+$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -21345,11 +21715,12 @@ _ACEOF
- 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;} ;;
-+ *_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
-@@ -21382,12 +21753,12 @@ echo "$as_me: WARNING: Cache variable $a
- 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;}
-+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_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;}
-+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -21403,7 +21774,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=`echo "$ac_i" | sed "$ac_script"`
-+ 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"
-@@ -21415,23 +21786,23 @@ LTLIBOBJS=$ac_ltlibobjs
-
-
+ echo "$MUTTER_PKG_ERRORS" >&5
+@@ -22473,14 +22433,6 @@
+ LTLIBOBJS=$ac_ltlibobjs
+
+
+- if test -n "$EXEEXT"; then
+- am__EXEEXT_TRUE=
+- am__EXEEXT_FALSE='#'
+-else
+- am__EXEEXT_TRUE='#'
+- am__EXEEXT_FALSE=
+-fi
+-
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ { { $as_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.
-+$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 "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+ { { $as_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.
-+$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
-- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+ { { $as_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.
-+$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
-@@ -21440,47 +21811,49 @@ fi
-
-
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+ { { $as_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.
-+$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 "${HAVE_SM_TRUE}" && test -z "${HAVE_SM_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"HAVE_SM\" was never defined.
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_SM\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_SM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-+$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" 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"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
-+{ $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.
-@@ -21493,7 +21866,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-@@ -21503,7 +21876,7 @@ 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
-+ # 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
-@@ -21525,17 +21898,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- 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=';'
-+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
-- PATH_SEPARATOR=:
-+ 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
-- rm -f conf$$.sh
-+ 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.
-@@ -21551,8 +21952,6 @@ 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.
-@@ -21575,7 +21974,7 @@ 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
-+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -21588,17 +21987,10 @@ 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
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -21620,7 +22012,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -21671,7 +22063,7 @@ $as_unset CDPATH
- 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
-+ { $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
-@@ -21699,7 +22091,6 @@ 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
-@@ -21712,19 +22103,22 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir
-+ mkdir conf$$.dir 2>/dev/null
- 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 ||
-+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'
--elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-+ fi
- else
- as_ln_s='cp -p'
- fi
-@@ -21749,10 +22143,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
-@@ -21775,7 +22169,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by metacity $as_me 2.26.0, which was
--generated by GNU Autoconf 2.61. Invocation command line was
-+generated by GNU Autoconf 2.63. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -21788,7 +22182,16 @@ on `(hostname || uname -n) 2>/dev/null |
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<_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
- # Files that config.status was made for.
- config_files="$ac_config_files"
- config_headers="$ac_config_headers"
-@@ -21796,22 +22199,23 @@ config_commands="$ac_config_commands"
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-
--Usage: $0 [OPTIONS] [FILE]...
-+Usage: $0 [OPTION]... [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
-+ -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
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-
- Configuration files:
- $config_files
-@@ -21825,13 +22229,13 @@ $config_commands
- Report bugs to <bug-autoconf at gnu.org>."
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_version="\\
- metacity config.status 2.26.0
--configured by $0, generated by GNU Autoconf 2.61,
-- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.63,
-+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2006 Free Software Foundation, Inc.
-+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."
-
-@@ -21839,11 +22243,12 @@ ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
- _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.
-+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
-@@ -21865,30 +22270,36 @@ do
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-- echo "$ac_cs_version"; exit ;;
-+ $as_echo "$ac_cs_version"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ 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
-- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+ 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
-- { echo "$as_me: error: ambiguous option: $1
-+ { $as_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 ;;
-+ $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.
-- -*) { echo "$as_me: error: unrecognized option: $1
-+ -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-@@ -21907,27 +22318,29 @@ if $ac_cs_silent; then
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- 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
-+ 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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ exec "\$@"
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<\_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
-- echo "$ac_log"
-+ $as_echo "$ac_log"
- } >&5
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #
- # INIT-COMMANDS
- #
-@@ -22192,7 +22605,7 @@ fi
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -22214,8 +22627,8 @@ do
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ *) { { $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
-@@ -22256,292 +22669,144 @@ $debug ||
- (umask 077 && mkdir "$tmp")
- } ||
- {
-- echo "$me: cannot create a temporary directory in ." >&2
-+ $as_echo "$as_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
-+# 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
-
--_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
-+fi
-+
-+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
-- 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
--MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
--MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
--MAINT!$MAINT$ac_delim
--ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
--GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
--USE_NLS!$USE_NLS$ac_delim
--INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
--INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
--INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
--INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
--INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
--INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
--INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
--INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
--INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
--INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
--INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
--INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
--INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
--INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
--INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
--INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
--INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
--INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
--INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
--INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
--INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
--INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
--XGETTEXT!$XGETTEXT$ac_delim
--MSGMERGE!$MSGMERGE$ac_delim
--MSGFMT!$MSGFMT$ac_delim
--GMSGFMT!$GMSGFMT$ac_delim
--INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
--ALL_LINGUAS!$ALL_LINGUAS$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--_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; }; }
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ 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
-- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { { $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
-
--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 <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--CEOF$ac_eof
-+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 = ""
-+
-+}
-+{
-+ 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
--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
--DATADIRNAME!$DATADIRNAME$ac_delim
--CPP!$CPP$ac_delim
--GREP!$GREP$ac_delim
--EGREP!$EGREP$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
--AS!$AS$ac_delim
--DLLTOOL!$DLLTOOL$ac_delim
--OBJDUMP!$OBJDUMP$ac_delim
--LIBTOOL!$LIBTOOL$ac_delim
--SED!$SED$ac_delim
--FGREP!$FGREP$ac_delim
--LD!$LD$ac_delim
--DUMPBIN!$DUMPBIN$ac_delim
--ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
--NM!$NM$ac_delim
--LN_S!$LN_S$ac_delim
--AR!$AR$ac_delim
--RANLIB!$RANLIB$ac_delim
--lt_ECHO!$lt_ECHO$ac_delim
--DSYMUTIL!$DSYMUTIL$ac_delim
--NMEDIT!$NMEDIT$ac_delim
--LIPO!$LIPO$ac_delim
--OTOOL!$OTOOL$ac_delim
--OTOOL64!$OTOOL64$ac_delim
--MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
--CATALOGS!$CATALOGS$ac_delim
--CATOBJEXT!$CATOBJEXT$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
--PKG_CONFIG!$PKG_CONFIG$ac_delim
--ALL_CFLAGS!$ALL_CFLAGS$ac_delim
--ALL_LIBS!$ALL_LIBS$ac_delim
--METACITY_MESSAGE_CFLAGS!$METACITY_MESSAGE_CFLAGS$ac_delim
--METACITY_MESSAGE_LIBS!$METACITY_MESSAGE_LIBS$ac_delim
--METACITY_WINDOW_DEMO_CFLAGS!$METACITY_WINDOW_DEMO_CFLAGS$ac_delim
--METACITY_WINDOW_DEMO_LIBS!$METACITY_WINDOW_DEMO_LIBS$ac_delim
--GNOME_KEYBINDINGS_KEYSDIR!$GNOME_KEYBINDINGS_KEYSDIR$ac_delim
--METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim
--METACITY_LIBS!$METACITY_LIBS$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_SM_TRUE!$HAVE_SM_TRUE$ac_delim
--HAVE_SM_FALSE!$HAVE_SM_FALSE$ac_delim
--HOST_ALIAS!$HOST_ALIAS$ac_delim
--GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim
--GCONFTOOL!$GCONFTOOL$ac_delim
--GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
--GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
--GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
--GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
--ZENITY!$ZENITY$ac_delim
--HELP_DIR!$HELP_DIR$ac_delim
--OMF_DIR!$OMF_DIR$ac_delim
--DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
--ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
--ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
--DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
--HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
--HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACAWK
- _ACEOF
--
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; 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;}
-+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;}
- { (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 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
-@@ -22557,19 +22822,133 @@ s/^[^=]*=[ ]*$//
- }'
- fi
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-+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.
-+
-+# 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"
-+
-
--for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-+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*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
--echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ :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;;
-@@ -22598,26 +22977,38 @@ echo "$as_me: error: Invalid tag $ac_tag
- [\\/$]*) 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;}
-+ { { $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
-- ac_file_inputs="$ac_file_inputs $ac_f"
-+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; 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."
-+ 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"
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-+ { $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
-
- case $ac_tag in
-- *:-:* | *:-) cat >"$tmp/stdin";;
-+ *:-:* | *:-) 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
-@@ -22627,7 +23018,7 @@ $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" |
-+$as_echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -22653,7 +23044,7 @@ echo X"$ac_file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -22662,7 +23053,7 @@ $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" |
-+$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -22683,17 +23074,17 @@ echo X"$as_dir" |
- 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;}
-+ } || 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=.
-
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
-- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ ac_dir_suffix=/`$as_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,/,,'`
-+ 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/ ;;
-@@ -22738,12 +23129,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- esac
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_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=
-
--case `sed -n '/datarootdir/ {
-+ac_sed_dataroot='
-+/datarootdir/ {
- p
- q
- }
-@@ -22752,13 +23144,14 @@ case `sed -n '/datarootdir/ {
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--' $ac_file_inputs` in
-+'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $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;}
-+ { $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
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
-@@ -22772,15 +23165,16 @@ _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
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s&@configure_input@&$configure_input&;t t
-+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
-@@ -22791,121 +23185,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- 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" >$tmp/out
-+"
-+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"; } &&
-- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+ { $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
--echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+$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;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
-- -) cat "$tmp/out"; rm -f "$tmp/out";;
-- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+@@ -23983,28 +23935,27 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
- esac
-+ -) 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
- #
--_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;}
-+ {
-+ $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
-+ 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
- else
-- echo "/* $configure_input */"
-- cat "$ac_result"
-+ $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; }; }
- fi
-- rm -f "$tmp/out12"
--# Compute $ac_file's index in $config_headers.
--_am_arg=$ac_file
-+# 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
-@@ -22920,7 +23253,7 @@ $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" |
-+$as_echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -22940,14 +23273,23 @@ echo X"$_am_arg" |
- 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;}
-+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+$as_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
+- shift
+- for mf
+- 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" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file. Let's play safe and only enable the eval
+# if we detect the quoting.
@@ -17946,1338 +2462,666 @@
+shift
+for mf
+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.
-@@ -22963,7 +23305,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
++ # 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" |
-+$as_echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
+@@ -24027,28 +23978,28 @@
q
-@@ -23007,7 +23349,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
+ }
+ 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
+- # 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" ||
++ 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_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$file" |
-+$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
+@@ -24071,7 +24022,7 @@
q
-@@ -23033,7 +23375,7 @@ echo X"$file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -23042,7 +23384,7 @@ $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" |
-+$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -23063,8 +23405,8 @@ echo X"$as_dir" |
- 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;}
-+ } || 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;}
+ }
+ s/.*/./; q'`
+- { as_dir=$dirpart/$fdir
++ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+@@ -24112,11 +24063,10 @@
+ } || 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"
-@@ -23716,9 +24058,9 @@ _LT_EOF
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac ;;
- "po/stamp-it":C)
-- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
-- { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
--echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-+ { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-+$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
- { (exit 1); exit 1; }; }
- fi
- rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-@@ -23747,6 +24089,11 @@ _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.
-@@ -23768,6 +24115,10 @@ 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
-
-
- if test x$enable_gconf = xno; then
-Index: metacity-2.26.0/doc/Makefile.in
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
+ done
+-}
++done
+ ;;
+ "libtool":C)
+
+Index: mutter-2.27.1/doc/Makefile.in
===================================================================
---- metacity-2.26.0.orig/doc/Makefile.in 2009-06-10 21:51:16.441920079 +0200
-+++ metacity-2.26.0/doc/Makefile.in 2009-06-10 21:50:28.865905950 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/doc/Makefile.in 2009-07-17 00:02:00.000000000 +0200
++++ mutter-2.27.1/doc/Makefile.in 2009-07-26 13:23:03.173792800 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,29 +107,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -233,6 +214,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = man creating_themes
-@@ -246,8 +228,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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,9 +15,8 @@
+ @SET_MAKE@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -42,7 +40,6 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -54,38 +51,10 @@
+ ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+- distdir
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-am__relativize = \
+- dir0=`pwd`; \
+- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+- sed_rest='s,^[^/]*/*,,'; \
+- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+- sed_butlast='s,/*[^/]*$$,,'; \
+- while test -n "$$dir1"; do \
+- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+- if test "$$first" != "."; then \
+- if test "$$first" = ".."; then \
+- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+- else \
+- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+- if test "$$first2" = "$$first"; then \
+- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+- else \
+- dir2="../$$dir2"; \
+- fi; \
+- dir0="$$dir0"/"$$first"; \
+- fi; \
+- fi; \
+- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+- done; \
+- reldir="$$dir2"
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_CFLAGS = @ALL_CFLAGS@
+@@ -284,9 +253,9 @@
exit 1;; \
esac; \
done; \
-@@ -353,7 +335,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu doc/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -304,7 +273,6 @@
+ 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
+-$(am__aclocal_m4_deps):
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -336,7 +304,7 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+@@ -370,16 +338,16 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -394,7 +362,7 @@
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- set x; \
++ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+@@ -406,7 +374,7 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -415,34 +383,29 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
+ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
++ tags=; \
+ 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; nonemtpy = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-Index: metacity-2.26.0/doc/creating_themes/Makefile.in
+- test -z "$(CTAGS_ARGS)$$unique" \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
++ $$tags $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -463,44 +426,29 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+- $(am__relativize); \
+- new_distdir=$$reldir; \
+- dir1=$$subdir; dir2="$(top_distdir)"; \
+- $(am__relativize); \
+- new_top_distdir=$$reldir; \
+- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+- ($(am__cd) $$subdir && \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$new_top_distdir" \
+- distdir="$$new_distdir" \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+- am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -530,7 +478,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -549,8 +496,6 @@
+
+ html: html-recursive
+
+-html-am:
+-
+ info: info-recursive
+
+ info-am:
+@@ -559,28 +504,18 @@
+
+ install-dvi: install-dvi-recursive
+
+-install-dvi-am:
+-
+ install-exec-am:
+
+ install-html: install-html-recursive
+
+-install-html-am:
+-
+ install-info: install-info-recursive
+
+-install-info-am:
+-
+ install-man:
+
+ install-pdf: install-pdf-recursive
+
+-install-pdf-am:
+-
+ install-ps: install-ps-recursive
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -601,8 +536,8 @@
+
+ uninstall-am:
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+- install-am install-strip tags-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+@@ -618,7 +553,6 @@
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: mutter-2.27.1/doc/man/Makefile.in
===================================================================
---- metacity-2.26.0.orig/doc/creating_themes/Makefile.in 2009-06-10 21:51:16.585415352 +0200
-+++ metacity-2.26.0/doc/creating_themes/Makefile.in 2009-06-10 21:50:29.033906292 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/doc/man/Makefile.in 2009-07-17 00:02:00.000000000 +0200
++++ mutter-2.27.1/doc/man/Makefile.in 2009-07-26 13:23:03.277790906 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -122,29 +122,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -248,6 +229,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-@@ -374,8 +356,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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,9 +15,8 @@
+ @SET_MAKE@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -42,30 +40,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_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 = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+- if (++n[$$2] == $(am__install_max)) \
+- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+- END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)"
+ NROFF = nroff
+@@ -269,9 +245,9 @@
exit 1;; \
esac; \
done; \
-@@ -839,14 +821,13 @@ install-doc-docs:
- install-doc-figs:
- @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
- for lc in C $(_DOC_REAL_LINGUAS); do \
-+ figsymlink=false; \
- if test -f "$$lc/$$fig"; then \
- figfile="$$lc/$$fig"; \
- elif test -f "$(srcdir)/$$lc/$$fig"; then \
- figfile="$(srcdir)/$$lc/$$fig"; \
-- elif test -f "C/$$fig"; then \
-- figfile="C/$$fig"; \
- else \
-- figfile="$(srcdir)/C/$$fig"; \
-+ figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-@@ -855,8 +836,13 @@ install-doc-figs:
- $(mkinstalldirs) "$$figdir"; \
- fi; \
- figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ if $$figsymlink; then \
-+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-+ else \
-+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ fi; \
- done; \
- done
-
-Index: metacity-2.26.0/doc/man/Makefile.in
-===================================================================
---- metacity-2.26.0.orig/doc/man/Makefile.in 2009-06-10 21:51:16.757413317 +0200
-+++ metacity-2.26.0/doc/man/Makefile.in 2009-06-10 21:50:29.117903280 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.10.2 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -99,29 +99,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -225,6 +206,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- man_MANS = metacity.1 metacity-theme-viewer.1 \
-@@ -238,8 +220,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/man/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu doc/man/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -289,51 +265,57 @@
+ 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
+-$(am__aclocal_m4_deps):
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-man1: $(man_MANS)
++install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
+- } | while read p; do \
+- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; echo "$$p"; \
+- done | \
+- sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+- sed 'N;N;s,\n, ,g' | { \
+- list=; while read file base inst; do \
+- if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+- fi; \
++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++ for i in $$l2; do \
++ case "$$i" in \
++ *.1*) list="$$list $$i" ;; \
++ esac; \
done; \
-@@ -280,8 +262,8 @@ install-man1: $(man1_MANS) $(man_MANS)
- esac; \
- done; \
- for i in $$list; do \
-- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-- else file=$$i; fi; \
+- for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+- while read files; do \
+- test -z "$$files" || { \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+- done; }
+-
++ for i in $$list; do \
+ if test -f $$i; then file=$$i; \
+ else file=$(srcdir)/$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
-Index: metacity-2.26.0/gnome-doc-utils.make
++ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++ case "$$ext" in \
++ 1*) ;; \
++ *) ext='1' ;; \
++ esac; \
++ 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"; \
++ done
+ uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- files=`{ for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
+- } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++ for i in $$l2; do \
++ case "$$i" in \
++ *.1*) list="$$list $$i" ;; \
++ esac; \
++ done; \
++ for i in $$list; do \
++ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++ case "$$ext" in \
++ 1*) ;; \
++ *) ext='1' ;; \
++ esac; \
++ 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"; \
++ done
+ tags: TAGS
+ TAGS:
+
+@@ -342,19 +324,6 @@
+
+
+ distdir: $(DISTFILES)
+- @list='$(MANS)'; if test -n "$$list"; then \
+- list=`for p in $$list; do \
+- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+- if test -n "$$list" && \
+- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+- echo " typically \`make maintainer-clean' will remove them" >&2; \
+- exit 1; \
+- else :; fi; \
+- else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -370,17 +339,13 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+@@ -411,7 +376,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -430,8 +394,6 @@
+
+ html: html-am
+
+-html-am:
+-
+ info: info-am
+
+ info-am:
+@@ -440,28 +402,18 @@
+
+ install-dvi: install-dvi-am
+
+-install-dvi-am:
+-
+ install-exec-am:
+
+ install-html: install-html-am
+
+-install-html-am:
+-
+ install-info: install-info-am
+
+-install-info-am:
+-
+ install-man: install-man1
+
+ install-pdf: install-pdf-am
+
+-install-pdf-am:
+-
+ install-ps: install-ps-am
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -498,7 +450,6 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-man uninstall-man1
+
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: mutter-2.27.1/ltmain.sh
===================================================================
---- metacity-2.26.0.orig/gnome-doc-utils.make 2009-06-10 21:51:16.925415610 +0200
-+++ metacity-2.26.0/gnome-doc-utils.make 2009-06-10 21:49:37.481911818 +0200
-@@ -504,14 +504,13 @@ install-doc-docs:
- install-doc-figs:
- @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
- for lc in C $(_DOC_REAL_LINGUAS); do \
-+ figsymlink=false; \
- if test -f "$$lc/$$fig"; then \
- figfile="$$lc/$$fig"; \
- elif test -f "$(srcdir)/$$lc/$$fig"; then \
- figfile="$(srcdir)/$$lc/$$fig"; \
-- elif test -f "C/$$fig"; then \
-- figfile="C/$$fig"; \
- else \
-- figfile="$(srcdir)/C/$$fig"; \
-+ figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-@@ -520,8 +519,13 @@ install-doc-figs:
- $(mkinstalldirs) "$$figdir"; \
- fi; \
- figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ if $$figsymlink; then \
-+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-+ else \
-+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+ fi; \
- done; \
- done
-
-Index: metacity-2.26.0/ltmain.sh
-===================================================================
---- metacity-2.26.0.orig/ltmain.sh 2009-06-10 21:51:16.269411699 +0200
-+++ metacity-2.26.0/ltmain.sh 2009-06-10 21:49:59.573656104 +0200
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
-
--# ltmain.sh (GNU libtool) 2.2.4
-+# ltmain.sh (GNU libtool) 2.2.6
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu5
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,9 +73,9 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.2.4 Debian-2.2.4-0ubuntu5"
-+VERSION="2.2.6 Debian-2.2.6a-4"
- TIMESTAMP=""
--package_revision=1.2976
-+package_revision=1.3012
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -805,7 +805,7 @@ func_enable_tag ()
-
-
- case $host in
-- *cygwin* | *mingw* | *pw32*)
-+ *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
-@@ -893,8 +893,9 @@ $opt_help || {
- # determined imposters.
- func_lalib_p ()
- {
-- $SED -e 4q "$1" 2>/dev/null \
-- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-+ test -f "$1" &&
-+ $SED -e 4q "$1" 2>/dev/null \
-+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
- }
-
- # func_lalib_unsafe_p file
-@@ -907,7 +908,7 @@ func_lalib_p ()
- func_lalib_unsafe_p ()
- {
- lalib_p=no
-- if test -r "$1" && exec 5<&0 <"$1"; then
-+ 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
-@@ -1275,7 +1276,7 @@ func_mode_compile ()
-
- # 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
-@@ -2046,7 +2047,7 @@ func_mode_install ()
- 'exit $?'
- tstripme="$stripme"
- case $host_os in
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- case $realname in
- *.dll.a)
- tstripme=""
-@@ -2152,7 +2153,7 @@ func_mode_install ()
-
- # Do a test to see if this is really a libtool program.
- case $host in
-- *cygwin*|*mingw*)
-+ *cygwin* | *mingw*)
- if func_ltwrapper_executable_p "$file"; then
- func_ltwrapper_scriptname "$file"
- wrapper=$func_ltwrapper_scriptname_result
-@@ -2358,7 +2359,7 @@ extern \"C\" {
- $RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- case $host in
-- *cygwin* | *mingw* )
-+ *cygwin* | *mingw* | *cegcc* )
- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- ;;
-@@ -2370,7 +2371,7 @@ extern \"C\" {
- eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- eval '$MV "$nlist"T "$nlist"'
- case $host in
-- *cygwin | *mingw* )
-+ *cygwin | *mingw* | *cegcc* )
- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- ;;
-@@ -2426,7 +2427,7 @@ typedef struct {
- } lt_dlsymlist;
- "
- case $host in
-- *cygwin* | *mingw* )
-+ *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
-@@ -2512,7 +2513,7 @@ static const void *lt_preloaded_setup()
- # Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
- case $host in
-- *cygwin* | *mingw* )
-+ *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%"`
-@@ -2691,25 +2692,16 @@ func_extract_archives ()
-
-
-
--# func_emit_wrapper arg
-+# func_emit_wrapper_part1 [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 variable
--# 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 '.lib' directory. This is a cygwin/mingw-specific
--# behavior.
--func_emit_wrapper ()
-+# 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_arg1=no
-+ func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
-- func_emit_wrapper_arg1=$1
-+ func_emit_wrapper_part1_arg1=$1
- fi
-
- $ECHO "\
-@@ -2794,10 +2786,27 @@ else
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
- done
-+"
-+}
-+# end: func_emit_wrapper_part1
-+
-+# 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_arg1
-+ 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
-@@ -2888,7 +2897,7 @@ else
- "
- case $host in
- # Backslashes separate directories on plain windows
-- *-*-mingw | *-*-os2*)
-+ *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
-@@ -2914,7 +2923,207 @@ else
- fi\
- "
- }
--# end: func_emit_wrapper
-+# end: func_emit_wrapper_part2
-+
-+
-+# 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
-+
-+ # 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}"
-+}
-+
-+
-+# 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
-+
-+# 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
-
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
-@@ -2951,6 +3160,12 @@ EOF
- # 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>
-@@ -3057,29 +3272,105 @@ 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);
-
--static const char *script_text =
-+static const char *script_text_part1 =
- EOF
-
-- func_emit_wrapper yes |
-+ func_emit_wrapper_part1 yes |
-+ $SED -e 's/\([\\"]\)/\\\1/g' \
-+ -e 's/^/ "/' -e 's/$/\\n"/'
-+ echo ";"
-+ cat <<EOF
-+
-+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
-+
-+ 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
-+
-+ 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 "$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
-+
-+
-+ cat <<"EOF"
-+
-+#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 *shwrapper_name;
-+ char *actual_cwrapper_name;
-+ char *target_name;
-+ char *lt_argv_zero;
- intptr_t rval = 127;
-- FILE *shwrapper;
-
-- const char *dumpscript_opt = "--lt-dump-script";
- int i;
-
- program_name = (char *) xstrdup (base_name (argv[0]));
-@@ -3099,38 +3390,14 @@ EOF
- ;;
- esac
-
-- cat <<EOF
-- printf ("%s", script_text);
-+ cat <<"EOF"
-+ printf ("%s", script_text_part1);
-+ printf ("%s", script_text_part2);
- return 0;
- }
- }
-
-- newargz = XMALLOC (char *, argc + 2);
--EOF
--
-- if test -n "$TARGETSHELL" ; then
-- # no path translation at all
-- lt_newargv0=$TARGETSHELL
-- else
-- case "$host" in
-- *mingw* )
-- # awkward: cmd appends spaces to result
-- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-- lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
-- case $lt_newargv0 in
-- *.exe | *.EXE) ;;
-- *) lt_newargv0=$lt_newargv0.exe ;;
-- esac
-- ;;
-- * ) lt_newargv0=$SHELL ;;
-- esac
-- fi
--
-- cat <<EOF
-- newargz[0] = (char *) xstrdup ("$lt_newargv0");
--EOF
--
-- cat <<"EOF"
-+ newargz = XMALLOC (char *, argc + 1);
- tmp_pathspec = find_executable (argv[0]);
- if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
-@@ -3142,39 +3409,60 @@ EOF
- actual_cwrapper_path));
- XFREE (tmp_pathspec);
-
-- shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
-- strendzap (actual_cwrapper_path, shwrapper_name);
-+ 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;
-
-- /* shwrapper_name transforms */
-- strendzap (shwrapper_name, ".exe");
-- tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
-- strlen ("_ltshwrapperTMP") + 1));
-- strcpy (tmp_pathspec, shwrapper_name);
-- strcat (tmp_pathspec, "_ltshwrapperTMP");
-- XFREE (shwrapper_name);
-- shwrapper_name = tmp_pathspec;
-+ /* 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 shell wrapper name: %s\n",
-- shwrapper_name));
-+
-+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+ target_name));
- EOF
-
- cat <<EOF
-- newargz[1] =
-+ newargz[0] =
- XMALLOC (char, (strlen (actual_cwrapper_path) +
-- strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
-- strcpy (newargz[1], actual_cwrapper_path);
-- strcat (newargz[1], "$objdir");
-- strcat (newargz[1], "/");
-- strcat (newargz[1], shwrapper_name);
-+ 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[1], '\\')) != NULL)
-+ while ((p = strchr (newargz[0], '\\')) != NULL)
-+ {
-+ *p = '/';
-+ }
-+ while ((p = strchr (lt_argv_zero, '\\')) != NULL)
- {
- *p = '/';
- }
-@@ -3184,55 +3472,114 @@ EOF
- esac
-
- cat <<"EOF"
-- XFREE (shwrapper_name);
-+ XFREE (target_name);
- XFREE (actual_cwrapper_path);
-+ XFREE (actual_cwrapper_name);
-
-- /* always write in binary mode */
-- if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
-- {
-- lt_fatal ("Could not open %s for writing", newargz[1]);
-- }
-- fprintf (shwrapper, "%s", script_text);
-- fclose (shwrapper);
--
-- make_executable (newargz[1]);
-+ 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++)
-- newargz[i + 1] = xstrdup (argv[i]);
-- newargz[argc + 1] = NULL;
-+ {
-+ 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;
-
-- for (i = 0; i < argc + 1; i++)
-+ 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]));
-+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
- }
-
- EOF
-
- case $host_os in
- mingw*)
-- cat <<EOF
-+ cat <<"EOF"
- /* execv doesn't actually work on mingw as expected on unix */
-- rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
-+ 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 \"$lt_newargv0\": errno = %d\n", errno));
-+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
- return 127;
- }
- return rval;
--}
- EOF
- ;;
- *)
-- cat <<EOF
-- execv ("$lt_newargv0", newargz);
-+ cat <<"EOF"
-+ execv (lt_argv_zero, newargz);
- return rval; /* =127, but avoids unused variable warning */
--}
- EOF
- ;;
- esac
-
- cat <<"EOF"
-+}
-
- void *
- xmalloc (size_t num)
-@@ -3506,6 +3853,177 @@ lt_fatal (const char *message, ...)
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- va_end (ap);
- }
-+
-+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;
-+}
-+
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+ const char *p;
-+ int len;
-+ if (!arg || !*arg)
-+ return 1;
-+
-+ p = strchr (arg, (int)'=');
-+
-+ if (!p)
-+ return 1;
-+
-+ *value = xstrdup (++p);
-+
-+ len = strlen (arg) - strlen (*value);
-+ *name = XMALLOC (char, len);
-+ strncpy (*name, arg, len-1);
-+ (*name)[len - 1] = '\0';
-+
-+ return 0;
-+}
-+
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+ }
-+
-+ lt_setenv (name, value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+ char *new_value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+ }
-+
-+ new_value = lt_extend_str (getenv (name), value, 0);
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+ char *new_value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+ }
-+
-+ new_value = lt_extend_str (getenv (name), value, 1);
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+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>")));
-+
-+ 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);
-+ }
-+}
-+
-+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);
-+ }
-+}
-+
-+
- EOF
- }
- # end: func_emit_cwrapperexe_src
-@@ -3515,7 +4033,7 @@ func_mode_link ()
- {
- $opt_debug
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-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
-@@ -3959,6 +4477,13 @@ func_mode_link ()
- -L*)
- func_stripname '-L' '' "$arg"
+--- mutter-2.27.1.orig/ltmain.sh 2009-07-16 21:30:57.000000000 +0200
++++ mutter-2.27.1/ltmain.sh 2009-07-26 13:22:50.645790616 +0200
+@@ -4646,6 +4646,13 @@
+ -R*)
+ func_stripname '-R' '' "$arg"
dir=$func_stripname_result
+ if test -z "$dir"; then
+ if test "$#" -gt 0; then
@@ -19289,43 +3133,7 @@
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -3977,14 +4502,16 @@ func_mode_link ()
- ;;
- esac
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-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
- ;;
-@@ -3995,7 +4522,7 @@ func_mode_link ()
- -l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
- # These systems don't actually have a C or math library (as such)
- continue
- ;;
-@@ -4072,7 +4599,7 @@ func_mode_link ()
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
-+ *-*-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"
-@@ -4820,19 +5347,19 @@ func_mode_link ()
+@@ -5344,19 +5351,19 @@
# 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"
@@ -19355,25 +3163,7 @@
continue
fi # $pass = conv
-@@ -5032,7 +5559,7 @@ func_mode_link ()
- if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
- case $host in
-- *cygwin* | *mingw*)
-+ *cygwin* | *mingw* | *cegcc*)
- # No point in relinking DLLs because paths are not encoded
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=no
-@@ -5102,7 +5629,7 @@ func_mode_link ()
- elif test -n "$soname_spec"; then
- # bleh windows
- case $host in
-- *cygwin* | mingw*)
-+ *cygwin* | mingw* | *cegcc*)
- func_arith $current - $age
- major=$func_arith_result
- versuffix="-$major"
-@@ -5369,6 +5896,7 @@ func_mode_link ()
+@@ -5893,6 +5900,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -19381,54 +3171,9 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -5884,7 +6412,7 @@ func_mode_link ()
- tempremovelist=`$ECHO "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
-- *.$objext)
-+ *.$objext | *.gcno)
- ;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
-@@ -5955,7 +6483,7 @@ func_mode_link ()
- if test "$build_libtool_libs" = yes; then
- if test -n "$rpath"; then
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
- # these systems don't actually have a c library (as such)!
- ;;
- *-*-rhapsody* | *-*-darwin1.[012])
-@@ -6454,7 +6982,7 @@ EOF
-
- orig_export_symbols=
- case $host_os in
-- cygwin* | mingw*)
-+ 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
-@@ -7079,14 +7607,16 @@ EOF
- esac
- fi
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-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
- ;;
-@@ -7156,6 +7686,10 @@ EOF
- wrappers_required=no
- fi
+@@ -7683,6 +7691,10 @@
+ # Disable wrappers for cegcc, we are cross compiling anyway.
+ wrappers_required=no
;;
+ *cegcc)
+ # Disable wrappers for cegcc, we are cross compiling anyway.
@@ -19437,291 +3182,2221 @@
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -7308,11 +7842,10 @@ EOF
-
- func_emit_cwrapperexe_src > $cwrappersource
-
-- # 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.
-+ # 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
-@@ -7597,7 +8130,7 @@ EOF
- # 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 ;;
-+ *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
-Index: metacity-2.26.0/src/Makefile.in
+Index: mutter-2.27.1/src/Makefile.in
===================================================================
---- metacity-2.26.0.orig/src/Makefile.in 2009-06-10 21:51:17.117905864 +0200
-+++ metacity-2.26.0/src/Makefile.in 2009-06-10 21:50:29.537903865 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/src/Makefile.in 2009-07-17 00:02:01.000000000 +0200
++++ mutter-2.27.1/src/Makefile.in 2009-07-26 13:23:03.657791100 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -210,29 +210,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -336,6 +317,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = libmetacity-private.la
-@@ -529,8 +511,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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.
+@@ -20,9 +19,8 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -51,33 +49,18 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = libmutter-private.pc mutter-plugins.pc
+-CONFIG_CLEAN_VPATH_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 = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+- if (++n[$$2] == $(am__install_max)) \
+- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+- END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(desktopfilesdir)" "$(DESTDIR)$(girdir)" \
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemadir)" \
+ "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(wmpropertiesdir)" \
+ "$(DESTDIR)$(libmutterincludedir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libmutter_private_la_DEPENDENCIES =
+ am_libmutter_private_la_OBJECTS = libmutter_private_la-boxes.lo \
+@@ -90,6 +73,7 @@
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libmutter_private_la_CFLAGS) $(CFLAGS) \
+ $(libmutter_private_la_LDFLAGS) $(LDFLAGS) -o $@
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am__objects_1 = mutter-marshal.$(OBJEXT) mutter-enum-types.$(OBJEXT)
+ am_mutter_OBJECTS = async-getprop.$(OBJEXT) alttabhandler.$(OBJEXT) \
+@@ -135,7 +119,6 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -158,43 +141,22 @@
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++desktopfilesDATA_INSTALL = $(INSTALL_DATA)
++girDATA_INSTALL = $(INSTALL_DATA)
++pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++schemaDATA_INSTALL = $(INSTALL_DATA)
++typelibDATA_INSTALL = $(INSTALL_DATA)
++wmpropertiesDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(desktopfiles_DATA) $(gir_DATA) $(pkgconfig_DATA) \
+ $(schema_DATA) $(typelib_DATA) $(wmproperties_DATA)
++libmutterincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(libmutterinclude_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+- distdir
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-am__relativize = \
+- dir0=`pwd`; \
+- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+- sed_rest='s,^[^/]*/*,,'; \
+- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+- sed_butlast='s,/*[^/]*$$,,'; \
+- while test -n "$$dir1"; do \
+- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+- if test "$$first" != "."; then \
+- if test "$$first" = ".."; then \
+- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+- else \
+- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+- if test "$$first2" = "$$first"; then \
+- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+- else \
+- dir2="../$$dir2"; \
+- fi; \
+- dir0="$$dir0"/"$$first"; \
+- fi; \
+- fi; \
+- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+- done; \
+- reldir="$$dir2"
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_CFLAGS = @ALL_CFLAGS@
+@@ -625,9 +587,9 @@
exit 1;; \
esac; \
done; \
-@@ -1634,7 +1616,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -645,7 +607,6 @@
+ 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
+-$(am__aclocal_m4_deps):
+ libmutter-private.pc: $(top_builddir)/config.status $(srcdir)/libmutter-private.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ mutter-plugins.pc: $(top_builddir)/config.status $(srcdir)/mutter-plugins.pc.in
+@@ -653,24 +614,20 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+- list2=; for p in $$list; do \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- list2="$$list2 $$p"; \
++ 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; \
+- test -z "$$list2" || { \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+- }
++ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+- for p in $$list; do \
+- $(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ 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:
+@@ -686,55 +643,38 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed 's/$(EXEEXT)$$//' | \
+- while read p p1; do if test -f $$p || test -f $$p1; \
+- then echo "$$p"; echo "$$p"; else :; fi; \
+- done | \
+- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+- sed 'N;N;N;s,\n, ,g' | \
+- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+- if ($$2 == $$4) files[d] = files[d] " " $$1; \
+- else { print "f", $$3 "/" $$4, $$1; } } \
+- END { for (d in files) print "f", d, files[d] }' | \
+- while read type dir files; do \
+- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+- test -z "$$files" || { \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+- } \
+- ; done
++ @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) $(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
+
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+- files=`for p in $$list; do echo "$$p"; done | \
+- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+- -e 's/$$/$(EXEEXT)/' `; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(bindir)" && rm -f $$files
++ @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"; \
++ done
+
+ clean-binPROGRAMS:
+- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
+
+ clean-noinstPROGRAMS:
+- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
+ mutter$(EXEEXT): $(mutter_OBJECTS) $(mutter_DEPENDENCIES)
+ @rm -f mutter$(EXEEXT)
+ $(mutter_LINK) $(mutter_OBJECTS) $(mutter_LDADD) $(LIBS)
+@@ -822,819 +762,819 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libmutter_private_la-boxes.lo: core/boxes.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-boxes.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-boxes.Tpo -c -o libmutter_private_la-boxes.lo `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-boxes.Tpo $(DEPDIR)/libmutter_private_la-boxes.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-boxes.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-boxes.Tpo -c -o libmutter_private_la-boxes.lo `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-boxes.Tpo $(DEPDIR)/libmutter_private_la-boxes.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/boxes.c' object='libmutter_private_la-boxes.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-boxes.lo `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-boxes.lo `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
+
+ libmutter_private_la-gradient.lo: ui/gradient.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-gradient.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-gradient.Tpo -c -o libmutter_private_la-gradient.lo `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-gradient.Tpo $(DEPDIR)/libmutter_private_la-gradient.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-gradient.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-gradient.Tpo -c -o libmutter_private_la-gradient.lo `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-gradient.Tpo $(DEPDIR)/libmutter_private_la-gradient.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/gradient.c' object='libmutter_private_la-gradient.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-gradient.lo `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-gradient.lo `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
+
+ libmutter_private_la-util.lo: core/util.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-util.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-util.Tpo -c -o libmutter_private_la-util.lo `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-util.Tpo $(DEPDIR)/libmutter_private_la-util.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-util.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-util.Tpo -c -o libmutter_private_la-util.lo `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-util.Tpo $(DEPDIR)/libmutter_private_la-util.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/util.c' object='libmutter_private_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-util.lo `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-util.lo `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
+
+ libmutter_private_la-preview-widget.lo: ui/preview-widget.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-preview-widget.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-preview-widget.Tpo -c -o libmutter_private_la-preview-widget.lo `test -f 'ui/preview-widget.c' || echo '$(srcdir)/'`ui/preview-widget.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-preview-widget.Tpo $(DEPDIR)/libmutter_private_la-preview-widget.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-preview-widget.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-preview-widget.Tpo -c -o libmutter_private_la-preview-widget.lo `test -f 'ui/preview-widget.c' || echo '$(srcdir)/'`ui/preview-widget.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-preview-widget.Tpo $(DEPDIR)/libmutter_private_la-preview-widget.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/preview-widget.c' object='libmutter_private_la-preview-widget.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-preview-widget.lo `test -f 'ui/preview-widget.c' || echo '$(srcdir)/'`ui/preview-widget.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-preview-widget.lo `test -f 'ui/preview-widget.c' || echo '$(srcdir)/'`ui/preview-widget.c
+
+ libmutter_private_la-theme-parser.lo: ui/theme-parser.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-theme-parser.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-theme-parser.Tpo -c -o libmutter_private_la-theme-parser.lo `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-theme-parser.Tpo $(DEPDIR)/libmutter_private_la-theme-parser.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-theme-parser.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-theme-parser.Tpo -c -o libmutter_private_la-theme-parser.lo `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-theme-parser.Tpo $(DEPDIR)/libmutter_private_la-theme-parser.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme-parser.c' object='libmutter_private_la-theme-parser.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-theme-parser.lo `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-theme-parser.lo `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
+
+ libmutter_private_la-theme.lo: ui/theme.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-theme.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-theme.Tpo -c -o libmutter_private_la-theme.lo `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmutter_private_la-theme.Tpo $(DEPDIR)/libmutter_private_la-theme.Plo
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -MT libmutter_private_la-theme.lo -MD -MP -MF $(DEPDIR)/libmutter_private_la-theme.Tpo -c -o libmutter_private_la-theme.lo `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmutter_private_la-theme.Tpo $(DEPDIR)/libmutter_private_la-theme.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme.c' object='libmutter_private_la-theme.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-theme.lo `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmutter_private_la_CFLAGS) $(CFLAGS) -c -o libmutter_private_la-theme.lo `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
+
+ async-getprop.o: core/async-getprop.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT async-getprop.o -MD -MP -MF $(DEPDIR)/async-getprop.Tpo -c -o async-getprop.o `test -f 'core/async-getprop.c' || echo '$(srcdir)/'`core/async-getprop.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/async-getprop.Tpo $(DEPDIR)/async-getprop.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/async-getprop.Tpo $(DEPDIR)/async-getprop.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/async-getprop.c' object='async-getprop.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o async-getprop.o `test -f 'core/async-getprop.c' || echo '$(srcdir)/'`core/async-getprop.c
+
+ async-getprop.obj: core/async-getprop.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT async-getprop.obj -MD -MP -MF $(DEPDIR)/async-getprop.Tpo -c -o async-getprop.obj `if test -f 'core/async-getprop.c'; then $(CYGPATH_W) 'core/async-getprop.c'; else $(CYGPATH_W) '$(srcdir)/core/async-getprop.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/async-getprop.Tpo $(DEPDIR)/async-getprop.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/async-getprop.Tpo $(DEPDIR)/async-getprop.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/async-getprop.c' object='async-getprop.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o async-getprop.obj `if test -f 'core/async-getprop.c'; then $(CYGPATH_W) 'core/async-getprop.c'; else $(CYGPATH_W) '$(srcdir)/core/async-getprop.c'; fi`
+
+ alttabhandler.o: core/alttabhandler.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alttabhandler.o -MD -MP -MF $(DEPDIR)/alttabhandler.Tpo -c -o alttabhandler.o `test -f 'core/alttabhandler.c' || echo '$(srcdir)/'`core/alttabhandler.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alttabhandler.Tpo $(DEPDIR)/alttabhandler.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/alttabhandler.Tpo $(DEPDIR)/alttabhandler.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/alttabhandler.c' object='alttabhandler.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alttabhandler.o `test -f 'core/alttabhandler.c' || echo '$(srcdir)/'`core/alttabhandler.c
+
+ alttabhandler.obj: core/alttabhandler.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alttabhandler.obj -MD -MP -MF $(DEPDIR)/alttabhandler.Tpo -c -o alttabhandler.obj `if test -f 'core/alttabhandler.c'; then $(CYGPATH_W) 'core/alttabhandler.c'; else $(CYGPATH_W) '$(srcdir)/core/alttabhandler.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alttabhandler.Tpo $(DEPDIR)/alttabhandler.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/alttabhandler.Tpo $(DEPDIR)/alttabhandler.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/alttabhandler.c' object='alttabhandler.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alttabhandler.obj `if test -f 'core/alttabhandler.c'; then $(CYGPATH_W) 'core/alttabhandler.c'; else $(CYGPATH_W) '$(srcdir)/core/alttabhandler.c'; fi`
+
+ alttabhandlerdefault.o: core/alttabhandlerdefault.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alttabhandlerdefault.o -MD -MP -MF $(DEPDIR)/alttabhandlerdefault.Tpo -c -o alttabhandlerdefault.o `test -f 'core/alttabhandlerdefault.c' || echo '$(srcdir)/'`core/alttabhandlerdefault.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alttabhandlerdefault.Tpo $(DEPDIR)/alttabhandlerdefault.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/alttabhandlerdefault.Tpo $(DEPDIR)/alttabhandlerdefault.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/alttabhandlerdefault.c' object='alttabhandlerdefault.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alttabhandlerdefault.o `test -f 'core/alttabhandlerdefault.c' || echo '$(srcdir)/'`core/alttabhandlerdefault.c
+
+ alttabhandlerdefault.obj: core/alttabhandlerdefault.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alttabhandlerdefault.obj -MD -MP -MF $(DEPDIR)/alttabhandlerdefault.Tpo -c -o alttabhandlerdefault.obj `if test -f 'core/alttabhandlerdefault.c'; then $(CYGPATH_W) 'core/alttabhandlerdefault.c'; else $(CYGPATH_W) '$(srcdir)/core/alttabhandlerdefault.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alttabhandlerdefault.Tpo $(DEPDIR)/alttabhandlerdefault.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/alttabhandlerdefault.Tpo $(DEPDIR)/alttabhandlerdefault.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/alttabhandlerdefault.c' object='alttabhandlerdefault.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alttabhandlerdefault.obj `if test -f 'core/alttabhandlerdefault.c'; then $(CYGPATH_W) 'core/alttabhandlerdefault.c'; else $(CYGPATH_W) '$(srcdir)/core/alttabhandlerdefault.c'; fi`
+
+ bell.o: core/bell.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bell.o -MD -MP -MF $(DEPDIR)/bell.Tpo -c -o bell.o `test -f 'core/bell.c' || echo '$(srcdir)/'`core/bell.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bell.Tpo $(DEPDIR)/bell.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bell.Tpo $(DEPDIR)/bell.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/bell.c' object='bell.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bell.o `test -f 'core/bell.c' || echo '$(srcdir)/'`core/bell.c
+
+ bell.obj: core/bell.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bell.obj -MD -MP -MF $(DEPDIR)/bell.Tpo -c -o bell.obj `if test -f 'core/bell.c'; then $(CYGPATH_W) 'core/bell.c'; else $(CYGPATH_W) '$(srcdir)/core/bell.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bell.Tpo $(DEPDIR)/bell.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bell.Tpo $(DEPDIR)/bell.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/bell.c' object='bell.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bell.obj `if test -f 'core/bell.c'; then $(CYGPATH_W) 'core/bell.c'; else $(CYGPATH_W) '$(srcdir)/core/bell.c'; fi`
+
+ boxes.o: core/boxes.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT boxes.o -MD -MP -MF $(DEPDIR)/boxes.Tpo -c -o boxes.o `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/boxes.Tpo $(DEPDIR)/boxes.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/boxes.Tpo $(DEPDIR)/boxes.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/boxes.c' object='boxes.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o boxes.o `test -f 'core/boxes.c' || echo '$(srcdir)/'`core/boxes.c
+
+ boxes.obj: core/boxes.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT boxes.obj -MD -MP -MF $(DEPDIR)/boxes.Tpo -c -o boxes.obj `if test -f 'core/boxes.c'; then $(CYGPATH_W) 'core/boxes.c'; else $(CYGPATH_W) '$(srcdir)/core/boxes.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/boxes.Tpo $(DEPDIR)/boxes.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/boxes.Tpo $(DEPDIR)/boxes.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/boxes.c' object='boxes.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o boxes.obj `if test -f 'core/boxes.c'; then $(CYGPATH_W) 'core/boxes.c'; else $(CYGPATH_W) '$(srcdir)/core/boxes.c'; fi`
+
+ compositor.o: compositor/compositor.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compositor.o -MD -MP -MF $(DEPDIR)/compositor.Tpo -c -o compositor.o `test -f 'compositor/compositor.c' || echo '$(srcdir)/'`compositor/compositor.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/compositor.Tpo $(DEPDIR)/compositor.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/compositor.Tpo $(DEPDIR)/compositor.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/compositor.c' object='compositor.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compositor.o `test -f 'compositor/compositor.c' || echo '$(srcdir)/'`compositor/compositor.c
+
+ compositor.obj: compositor/compositor.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compositor.obj -MD -MP -MF $(DEPDIR)/compositor.Tpo -c -o compositor.obj `if test -f 'compositor/compositor.c'; then $(CYGPATH_W) 'compositor/compositor.c'; else $(CYGPATH_W) '$(srcdir)/compositor/compositor.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/compositor.Tpo $(DEPDIR)/compositor.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/compositor.Tpo $(DEPDIR)/compositor.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/compositor.c' object='compositor.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compositor.obj `if test -f 'compositor/compositor.c'; then $(CYGPATH_W) 'compositor/compositor.c'; else $(CYGPATH_W) '$(srcdir)/compositor/compositor.c'; fi`
+
+ mutter-module.o: compositor/mutter-module.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-module.o -MD -MP -MF $(DEPDIR)/mutter-module.Tpo -c -o mutter-module.o `test -f 'compositor/mutter-module.c' || echo '$(srcdir)/'`compositor/mutter-module.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-module.Tpo $(DEPDIR)/mutter-module.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-module.Tpo $(DEPDIR)/mutter-module.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-module.c' object='mutter-module.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-module.o `test -f 'compositor/mutter-module.c' || echo '$(srcdir)/'`compositor/mutter-module.c
+
+ mutter-module.obj: compositor/mutter-module.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-module.obj -MD -MP -MF $(DEPDIR)/mutter-module.Tpo -c -o mutter-module.obj `if test -f 'compositor/mutter-module.c'; then $(CYGPATH_W) 'compositor/mutter-module.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-module.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-module.Tpo $(DEPDIR)/mutter-module.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-module.Tpo $(DEPDIR)/mutter-module.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-module.c' object='mutter-module.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-module.obj `if test -f 'compositor/mutter-module.c'; then $(CYGPATH_W) 'compositor/mutter-module.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-module.c'; fi`
+
+ mutter-plugin.o: compositor/mutter-plugin.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-plugin.o -MD -MP -MF $(DEPDIR)/mutter-plugin.Tpo -c -o mutter-plugin.o `test -f 'compositor/mutter-plugin.c' || echo '$(srcdir)/'`compositor/mutter-plugin.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-plugin.Tpo $(DEPDIR)/mutter-plugin.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-plugin.Tpo $(DEPDIR)/mutter-plugin.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-plugin.c' object='mutter-plugin.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-plugin.o `test -f 'compositor/mutter-plugin.c' || echo '$(srcdir)/'`compositor/mutter-plugin.c
+
+ mutter-plugin.obj: compositor/mutter-plugin.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-plugin.obj -MD -MP -MF $(DEPDIR)/mutter-plugin.Tpo -c -o mutter-plugin.obj `if test -f 'compositor/mutter-plugin.c'; then $(CYGPATH_W) 'compositor/mutter-plugin.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-plugin.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-plugin.Tpo $(DEPDIR)/mutter-plugin.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-plugin.Tpo $(DEPDIR)/mutter-plugin.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-plugin.c' object='mutter-plugin.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-plugin.obj `if test -f 'compositor/mutter-plugin.c'; then $(CYGPATH_W) 'compositor/mutter-plugin.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-plugin.c'; fi`
+
+ mutter-plugin-manager.o: compositor/mutter-plugin-manager.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-plugin-manager.o -MD -MP -MF $(DEPDIR)/mutter-plugin-manager.Tpo -c -o mutter-plugin-manager.o `test -f 'compositor/mutter-plugin-manager.c' || echo '$(srcdir)/'`compositor/mutter-plugin-manager.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-plugin-manager.Tpo $(DEPDIR)/mutter-plugin-manager.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-plugin-manager.Tpo $(DEPDIR)/mutter-plugin-manager.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-plugin-manager.c' object='mutter-plugin-manager.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-plugin-manager.o `test -f 'compositor/mutter-plugin-manager.c' || echo '$(srcdir)/'`compositor/mutter-plugin-manager.c
+
+ mutter-plugin-manager.obj: compositor/mutter-plugin-manager.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-plugin-manager.obj -MD -MP -MF $(DEPDIR)/mutter-plugin-manager.Tpo -c -o mutter-plugin-manager.obj `if test -f 'compositor/mutter-plugin-manager.c'; then $(CYGPATH_W) 'compositor/mutter-plugin-manager.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-plugin-manager.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-plugin-manager.Tpo $(DEPDIR)/mutter-plugin-manager.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-plugin-manager.Tpo $(DEPDIR)/mutter-plugin-manager.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-plugin-manager.c' object='mutter-plugin-manager.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-plugin-manager.obj `if test -f 'compositor/mutter-plugin-manager.c'; then $(CYGPATH_W) 'compositor/mutter-plugin-manager.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-plugin-manager.c'; fi`
+
+ mutter-shaped-texture.o: compositor/mutter-shaped-texture.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-shaped-texture.o -MD -MP -MF $(DEPDIR)/mutter-shaped-texture.Tpo -c -o mutter-shaped-texture.o `test -f 'compositor/mutter-shaped-texture.c' || echo '$(srcdir)/'`compositor/mutter-shaped-texture.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-shaped-texture.Tpo $(DEPDIR)/mutter-shaped-texture.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-shaped-texture.Tpo $(DEPDIR)/mutter-shaped-texture.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-shaped-texture.c' object='mutter-shaped-texture.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-shaped-texture.o `test -f 'compositor/mutter-shaped-texture.c' || echo '$(srcdir)/'`compositor/mutter-shaped-texture.c
+
+ mutter-shaped-texture.obj: compositor/mutter-shaped-texture.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-shaped-texture.obj -MD -MP -MF $(DEPDIR)/mutter-shaped-texture.Tpo -c -o mutter-shaped-texture.obj `if test -f 'compositor/mutter-shaped-texture.c'; then $(CYGPATH_W) 'compositor/mutter-shaped-texture.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-shaped-texture.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-shaped-texture.Tpo $(DEPDIR)/mutter-shaped-texture.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-shaped-texture.Tpo $(DEPDIR)/mutter-shaped-texture.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-shaped-texture.c' object='mutter-shaped-texture.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-shaped-texture.obj `if test -f 'compositor/mutter-shaped-texture.c'; then $(CYGPATH_W) 'compositor/mutter-shaped-texture.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-shaped-texture.c'; fi`
+
+ mutter-window.o: compositor/mutter-window.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-window.o -MD -MP -MF $(DEPDIR)/mutter-window.Tpo -c -o mutter-window.o `test -f 'compositor/mutter-window.c' || echo '$(srcdir)/'`compositor/mutter-window.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-window.Tpo $(DEPDIR)/mutter-window.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-window.Tpo $(DEPDIR)/mutter-window.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-window.c' object='mutter-window.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-window.o `test -f 'compositor/mutter-window.c' || echo '$(srcdir)/'`compositor/mutter-window.c
+
+ mutter-window.obj: compositor/mutter-window.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-window.obj -MD -MP -MF $(DEPDIR)/mutter-window.Tpo -c -o mutter-window.obj `if test -f 'compositor/mutter-window.c'; then $(CYGPATH_W) 'compositor/mutter-window.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-window.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-window.Tpo $(DEPDIR)/mutter-window.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-window.Tpo $(DEPDIR)/mutter-window.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-window.c' object='mutter-window.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-window.obj `if test -f 'compositor/mutter-window.c'; then $(CYGPATH_W) 'compositor/mutter-window.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-window.c'; fi`
+
+ mutter-window-group.o: compositor/mutter-window-group.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-window-group.o -MD -MP -MF $(DEPDIR)/mutter-window-group.Tpo -c -o mutter-window-group.o `test -f 'compositor/mutter-window-group.c' || echo '$(srcdir)/'`compositor/mutter-window-group.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-window-group.Tpo $(DEPDIR)/mutter-window-group.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-window-group.Tpo $(DEPDIR)/mutter-window-group.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-window-group.c' object='mutter-window-group.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-window-group.o `test -f 'compositor/mutter-window-group.c' || echo '$(srcdir)/'`compositor/mutter-window-group.c
+
+ mutter-window-group.obj: compositor/mutter-window-group.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutter-window-group.obj -MD -MP -MF $(DEPDIR)/mutter-window-group.Tpo -c -o mutter-window-group.obj `if test -f 'compositor/mutter-window-group.c'; then $(CYGPATH_W) 'compositor/mutter-window-group.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-window-group.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mutter-window-group.Tpo $(DEPDIR)/mutter-window-group.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mutter-window-group.Tpo $(DEPDIR)/mutter-window-group.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/mutter-window-group.c' object='mutter-window-group.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutter-window-group.obj `if test -f 'compositor/mutter-window-group.c'; then $(CYGPATH_W) 'compositor/mutter-window-group.c'; else $(CYGPATH_W) '$(srcdir)/compositor/mutter-window-group.c'; fi`
+
+ shadow.o: compositor/shadow.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shadow.o -MD -MP -MF $(DEPDIR)/shadow.Tpo -c -o shadow.o `test -f 'compositor/shadow.c' || echo '$(srcdir)/'`compositor/shadow.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shadow.Tpo $(DEPDIR)/shadow.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/shadow.Tpo $(DEPDIR)/shadow.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/shadow.c' object='shadow.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shadow.o `test -f 'compositor/shadow.c' || echo '$(srcdir)/'`compositor/shadow.c
+
+ shadow.obj: compositor/shadow.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shadow.obj -MD -MP -MF $(DEPDIR)/shadow.Tpo -c -o shadow.obj `if test -f 'compositor/shadow.c'; then $(CYGPATH_W) 'compositor/shadow.c'; else $(CYGPATH_W) '$(srcdir)/compositor/shadow.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shadow.Tpo $(DEPDIR)/shadow.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/shadow.Tpo $(DEPDIR)/shadow.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/shadow.c' object='shadow.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shadow.obj `if test -f 'compositor/shadow.c'; then $(CYGPATH_W) 'compositor/shadow.c'; else $(CYGPATH_W) '$(srcdir)/compositor/shadow.c'; fi`
+
+ tidy-texture-frame.o: compositor/tidy/tidy-texture-frame.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tidy-texture-frame.o -MD -MP -MF $(DEPDIR)/tidy-texture-frame.Tpo -c -o tidy-texture-frame.o `test -f 'compositor/tidy/tidy-texture-frame.c' || echo '$(srcdir)/'`compositor/tidy/tidy-texture-frame.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tidy-texture-frame.Tpo $(DEPDIR)/tidy-texture-frame.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/tidy-texture-frame.Tpo $(DEPDIR)/tidy-texture-frame.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/tidy/tidy-texture-frame.c' object='tidy-texture-frame.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tidy-texture-frame.o `test -f 'compositor/tidy/tidy-texture-frame.c' || echo '$(srcdir)/'`compositor/tidy/tidy-texture-frame.c
+
+ tidy-texture-frame.obj: compositor/tidy/tidy-texture-frame.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tidy-texture-frame.obj -MD -MP -MF $(DEPDIR)/tidy-texture-frame.Tpo -c -o tidy-texture-frame.obj `if test -f 'compositor/tidy/tidy-texture-frame.c'; then $(CYGPATH_W) 'compositor/tidy/tidy-texture-frame.c'; else $(CYGPATH_W) '$(srcdir)/compositor/tidy/tidy-texture-frame.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tidy-texture-frame.Tpo $(DEPDIR)/tidy-texture-frame.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/tidy-texture-frame.Tpo $(DEPDIR)/tidy-texture-frame.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compositor/tidy/tidy-texture-frame.c' object='tidy-texture-frame.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tidy-texture-frame.obj `if test -f 'compositor/tidy/tidy-texture-frame.c'; then $(CYGPATH_W) 'compositor/tidy/tidy-texture-frame.c'; else $(CYGPATH_W) '$(srcdir)/compositor/tidy/tidy-texture-frame.c'; fi`
+
+ constraints.o: core/constraints.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT constraints.o -MD -MP -MF $(DEPDIR)/constraints.Tpo -c -o constraints.o `test -f 'core/constraints.c' || echo '$(srcdir)/'`core/constraints.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/constraints.Tpo $(DEPDIR)/constraints.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/constraints.Tpo $(DEPDIR)/constraints.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/constraints.c' object='constraints.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o constraints.o `test -f 'core/constraints.c' || echo '$(srcdir)/'`core/constraints.c
+
+ constraints.obj: core/constraints.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT constraints.obj -MD -MP -MF $(DEPDIR)/constraints.Tpo -c -o constraints.obj `if test -f 'core/constraints.c'; then $(CYGPATH_W) 'core/constraints.c'; else $(CYGPATH_W) '$(srcdir)/core/constraints.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/constraints.Tpo $(DEPDIR)/constraints.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/constraints.Tpo $(DEPDIR)/constraints.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/constraints.c' object='constraints.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o constraints.obj `if test -f 'core/constraints.c'; then $(CYGPATH_W) 'core/constraints.c'; else $(CYGPATH_W) '$(srcdir)/core/constraints.c'; fi`
+
+ core.o: core/core.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT core.o -MD -MP -MF $(DEPDIR)/core.Tpo -c -o core.o `test -f 'core/core.c' || echo '$(srcdir)/'`core/core.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/core.Tpo $(DEPDIR)/core.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/core.Tpo $(DEPDIR)/core.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/core.c' object='core.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o core.o `test -f 'core/core.c' || echo '$(srcdir)/'`core/core.c
+
+ core.obj: core/core.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT core.obj -MD -MP -MF $(DEPDIR)/core.Tpo -c -o core.obj `if test -f 'core/core.c'; then $(CYGPATH_W) 'core/core.c'; else $(CYGPATH_W) '$(srcdir)/core/core.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/core.Tpo $(DEPDIR)/core.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/core.Tpo $(DEPDIR)/core.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/core.c' object='core.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o core.obj `if test -f 'core/core.c'; then $(CYGPATH_W) 'core/core.c'; else $(CYGPATH_W) '$(srcdir)/core/core.c'; fi`
+
+ delete.o: core/delete.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete.o -MD -MP -MF $(DEPDIR)/delete.Tpo -c -o delete.o `test -f 'core/delete.c' || echo '$(srcdir)/'`core/delete.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/delete.Tpo $(DEPDIR)/delete.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/delete.Tpo $(DEPDIR)/delete.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/delete.c' object='delete.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete.o `test -f 'core/delete.c' || echo '$(srcdir)/'`core/delete.c
+
+ delete.obj: core/delete.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete.obj -MD -MP -MF $(DEPDIR)/delete.Tpo -c -o delete.obj `if test -f 'core/delete.c'; then $(CYGPATH_W) 'core/delete.c'; else $(CYGPATH_W) '$(srcdir)/core/delete.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/delete.Tpo $(DEPDIR)/delete.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/delete.Tpo $(DEPDIR)/delete.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/delete.c' object='delete.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete.obj `if test -f 'core/delete.c'; then $(CYGPATH_W) 'core/delete.c'; else $(CYGPATH_W) '$(srcdir)/core/delete.c'; fi`
+
+ display.o: core/display.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT display.o -MD -MP -MF $(DEPDIR)/display.Tpo -c -o display.o `test -f 'core/display.c' || echo '$(srcdir)/'`core/display.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/display.Tpo $(DEPDIR)/display.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/display.Tpo $(DEPDIR)/display.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/display.c' object='display.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o display.o `test -f 'core/display.c' || echo '$(srcdir)/'`core/display.c
+
+ display.obj: core/display.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT display.obj -MD -MP -MF $(DEPDIR)/display.Tpo -c -o display.obj `if test -f 'core/display.c'; then $(CYGPATH_W) 'core/display.c'; else $(CYGPATH_W) '$(srcdir)/core/display.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/display.Tpo $(DEPDIR)/display.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/display.Tpo $(DEPDIR)/display.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/display.c' object='display.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o display.obj `if test -f 'core/display.c'; then $(CYGPATH_W) 'core/display.c'; else $(CYGPATH_W) '$(srcdir)/core/display.c'; fi`
+
+ draw-workspace.o: ui/draw-workspace.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT draw-workspace.o -MD -MP -MF $(DEPDIR)/draw-workspace.Tpo -c -o draw-workspace.o `test -f 'ui/draw-workspace.c' || echo '$(srcdir)/'`ui/draw-workspace.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/draw-workspace.Tpo $(DEPDIR)/draw-workspace.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/draw-workspace.Tpo $(DEPDIR)/draw-workspace.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/draw-workspace.c' object='draw-workspace.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o draw-workspace.o `test -f 'ui/draw-workspace.c' || echo '$(srcdir)/'`ui/draw-workspace.c
+
+ draw-workspace.obj: ui/draw-workspace.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT draw-workspace.obj -MD -MP -MF $(DEPDIR)/draw-workspace.Tpo -c -o draw-workspace.obj `if test -f 'ui/draw-workspace.c'; then $(CYGPATH_W) 'ui/draw-workspace.c'; else $(CYGPATH_W) '$(srcdir)/ui/draw-workspace.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/draw-workspace.Tpo $(DEPDIR)/draw-workspace.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/draw-workspace.Tpo $(DEPDIR)/draw-workspace.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/draw-workspace.c' object='draw-workspace.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o draw-workspace.obj `if test -f 'ui/draw-workspace.c'; then $(CYGPATH_W) 'ui/draw-workspace.c'; else $(CYGPATH_W) '$(srcdir)/ui/draw-workspace.c'; fi`
+
+ edge-resistance.o: core/edge-resistance.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT edge-resistance.o -MD -MP -MF $(DEPDIR)/edge-resistance.Tpo -c -o edge-resistance.o `test -f 'core/edge-resistance.c' || echo '$(srcdir)/'`core/edge-resistance.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/edge-resistance.Tpo $(DEPDIR)/edge-resistance.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/edge-resistance.Tpo $(DEPDIR)/edge-resistance.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/edge-resistance.c' object='edge-resistance.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o edge-resistance.o `test -f 'core/edge-resistance.c' || echo '$(srcdir)/'`core/edge-resistance.c
+
+ edge-resistance.obj: core/edge-resistance.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT edge-resistance.obj -MD -MP -MF $(DEPDIR)/edge-resistance.Tpo -c -o edge-resistance.obj `if test -f 'core/edge-resistance.c'; then $(CYGPATH_W) 'core/edge-resistance.c'; else $(CYGPATH_W) '$(srcdir)/core/edge-resistance.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/edge-resistance.Tpo $(DEPDIR)/edge-resistance.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/edge-resistance.Tpo $(DEPDIR)/edge-resistance.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/edge-resistance.c' object='edge-resistance.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o edge-resistance.obj `if test -f 'core/edge-resistance.c'; then $(CYGPATH_W) 'core/edge-resistance.c'; else $(CYGPATH_W) '$(srcdir)/core/edge-resistance.c'; fi`
+
+ errors.o: core/errors.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errors.o -MD -MP -MF $(DEPDIR)/errors.Tpo -c -o errors.o `test -f 'core/errors.c' || echo '$(srcdir)/'`core/errors.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/errors.Tpo $(DEPDIR)/errors.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/errors.Tpo $(DEPDIR)/errors.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/errors.c' object='errors.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errors.o `test -f 'core/errors.c' || echo '$(srcdir)/'`core/errors.c
+
+ errors.obj: core/errors.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errors.obj -MD -MP -MF $(DEPDIR)/errors.Tpo -c -o errors.obj `if test -f 'core/errors.c'; then $(CYGPATH_W) 'core/errors.c'; else $(CYGPATH_W) '$(srcdir)/core/errors.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/errors.Tpo $(DEPDIR)/errors.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/errors.Tpo $(DEPDIR)/errors.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/errors.c' object='errors.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errors.obj `if test -f 'core/errors.c'; then $(CYGPATH_W) 'core/errors.c'; else $(CYGPATH_W) '$(srcdir)/core/errors.c'; fi`
+
+ eventqueue.o: core/eventqueue.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eventqueue.o -MD -MP -MF $(DEPDIR)/eventqueue.Tpo -c -o eventqueue.o `test -f 'core/eventqueue.c' || echo '$(srcdir)/'`core/eventqueue.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eventqueue.Tpo $(DEPDIR)/eventqueue.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/eventqueue.Tpo $(DEPDIR)/eventqueue.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/eventqueue.c' object='eventqueue.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eventqueue.o `test -f 'core/eventqueue.c' || echo '$(srcdir)/'`core/eventqueue.c
+
+ eventqueue.obj: core/eventqueue.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eventqueue.obj -MD -MP -MF $(DEPDIR)/eventqueue.Tpo -c -o eventqueue.obj `if test -f 'core/eventqueue.c'; then $(CYGPATH_W) 'core/eventqueue.c'; else $(CYGPATH_W) '$(srcdir)/core/eventqueue.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eventqueue.Tpo $(DEPDIR)/eventqueue.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/eventqueue.Tpo $(DEPDIR)/eventqueue.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/eventqueue.c' object='eventqueue.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eventqueue.obj `if test -f 'core/eventqueue.c'; then $(CYGPATH_W) 'core/eventqueue.c'; else $(CYGPATH_W) '$(srcdir)/core/eventqueue.c'; fi`
+
+ frame.o: core/frame.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frame.o -MD -MP -MF $(DEPDIR)/frame.Tpo -c -o frame.o `test -f 'core/frame.c' || echo '$(srcdir)/'`core/frame.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/frame.c' object='frame.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frame.o `test -f 'core/frame.c' || echo '$(srcdir)/'`core/frame.c
+
+ frame.obj: core/frame.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frame.obj -MD -MP -MF $(DEPDIR)/frame.Tpo -c -o frame.obj `if test -f 'core/frame.c'; then $(CYGPATH_W) 'core/frame.c'; else $(CYGPATH_W) '$(srcdir)/core/frame.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/frame.c' object='frame.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frame.obj `if test -f 'core/frame.c'; then $(CYGPATH_W) 'core/frame.c'; else $(CYGPATH_W) '$(srcdir)/core/frame.c'; fi`
+
+ gradient.o: ui/gradient.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gradient.o -MD -MP -MF $(DEPDIR)/gradient.Tpo -c -o gradient.o `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gradient.Tpo $(DEPDIR)/gradient.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gradient.Tpo $(DEPDIR)/gradient.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/gradient.c' object='gradient.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gradient.o `test -f 'ui/gradient.c' || echo '$(srcdir)/'`ui/gradient.c
+
+ gradient.obj: ui/gradient.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gradient.obj -MD -MP -MF $(DEPDIR)/gradient.Tpo -c -o gradient.obj `if test -f 'ui/gradient.c'; then $(CYGPATH_W) 'ui/gradient.c'; else $(CYGPATH_W) '$(srcdir)/ui/gradient.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gradient.Tpo $(DEPDIR)/gradient.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gradient.Tpo $(DEPDIR)/gradient.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/gradient.c' object='gradient.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gradient.obj `if test -f 'ui/gradient.c'; then $(CYGPATH_W) 'ui/gradient.c'; else $(CYGPATH_W) '$(srcdir)/ui/gradient.c'; fi`
+
+ group-props.o: core/group-props.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT group-props.o -MD -MP -MF $(DEPDIR)/group-props.Tpo -c -o group-props.o `test -f 'core/group-props.c' || echo '$(srcdir)/'`core/group-props.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/group-props.Tpo $(DEPDIR)/group-props.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/group-props.Tpo $(DEPDIR)/group-props.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/group-props.c' object='group-props.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o group-props.o `test -f 'core/group-props.c' || echo '$(srcdir)/'`core/group-props.c
+
+ group-props.obj: core/group-props.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT group-props.obj -MD -MP -MF $(DEPDIR)/group-props.Tpo -c -o group-props.obj `if test -f 'core/group-props.c'; then $(CYGPATH_W) 'core/group-props.c'; else $(CYGPATH_W) '$(srcdir)/core/group-props.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/group-props.Tpo $(DEPDIR)/group-props.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/group-props.Tpo $(DEPDIR)/group-props.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/group-props.c' object='group-props.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o group-props.obj `if test -f 'core/group-props.c'; then $(CYGPATH_W) 'core/group-props.c'; else $(CYGPATH_W) '$(srcdir)/core/group-props.c'; fi`
+
+ group.o: core/group.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT group.o -MD -MP -MF $(DEPDIR)/group.Tpo -c -o group.o `test -f 'core/group.c' || echo '$(srcdir)/'`core/group.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/group.Tpo $(DEPDIR)/group.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/group.Tpo $(DEPDIR)/group.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/group.c' object='group.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o group.o `test -f 'core/group.c' || echo '$(srcdir)/'`core/group.c
+
+ group.obj: core/group.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT group.obj -MD -MP -MF $(DEPDIR)/group.Tpo -c -o group.obj `if test -f 'core/group.c'; then $(CYGPATH_W) 'core/group.c'; else $(CYGPATH_W) '$(srcdir)/core/group.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/group.Tpo $(DEPDIR)/group.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/group.Tpo $(DEPDIR)/group.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/group.c' object='group.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o group.obj `if test -f 'core/group.c'; then $(CYGPATH_W) 'core/group.c'; else $(CYGPATH_W) '$(srcdir)/core/group.c'; fi`
+
+ iconcache.o: core/iconcache.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iconcache.o -MD -MP -MF $(DEPDIR)/iconcache.Tpo -c -o iconcache.o `test -f 'core/iconcache.c' || echo '$(srcdir)/'`core/iconcache.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/iconcache.Tpo $(DEPDIR)/iconcache.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iconcache.Tpo $(DEPDIR)/iconcache.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/iconcache.c' object='iconcache.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconcache.o `test -f 'core/iconcache.c' || echo '$(srcdir)/'`core/iconcache.c
+
+ iconcache.obj: core/iconcache.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iconcache.obj -MD -MP -MF $(DEPDIR)/iconcache.Tpo -c -o iconcache.obj `if test -f 'core/iconcache.c'; then $(CYGPATH_W) 'core/iconcache.c'; else $(CYGPATH_W) '$(srcdir)/core/iconcache.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/iconcache.Tpo $(DEPDIR)/iconcache.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iconcache.Tpo $(DEPDIR)/iconcache.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/iconcache.c' object='iconcache.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconcache.obj `if test -f 'core/iconcache.c'; then $(CYGPATH_W) 'core/iconcache.c'; else $(CYGPATH_W) '$(srcdir)/core/iconcache.c'; fi`
+
+ keybindings.o: core/keybindings.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT keybindings.o -MD -MP -MF $(DEPDIR)/keybindings.Tpo -c -o keybindings.o `test -f 'core/keybindings.c' || echo '$(srcdir)/'`core/keybindings.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/keybindings.Tpo $(DEPDIR)/keybindings.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/keybindings.Tpo $(DEPDIR)/keybindings.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/keybindings.c' object='keybindings.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o keybindings.o `test -f 'core/keybindings.c' || echo '$(srcdir)/'`core/keybindings.c
+
+ keybindings.obj: core/keybindings.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT keybindings.obj -MD -MP -MF $(DEPDIR)/keybindings.Tpo -c -o keybindings.obj `if test -f 'core/keybindings.c'; then $(CYGPATH_W) 'core/keybindings.c'; else $(CYGPATH_W) '$(srcdir)/core/keybindings.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/keybindings.Tpo $(DEPDIR)/keybindings.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/keybindings.Tpo $(DEPDIR)/keybindings.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/keybindings.c' object='keybindings.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o keybindings.obj `if test -f 'core/keybindings.c'; then $(CYGPATH_W) 'core/keybindings.c'; else $(CYGPATH_W) '$(srcdir)/core/keybindings.c'; fi`
+
+ main.o: core/main.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'core/main.c' || echo '$(srcdir)/'`core/main.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'core/main.c' || echo '$(srcdir)/'`core/main.c
+
+ main.obj: core/main.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'core/main.c'; then $(CYGPATH_W) 'core/main.c'; else $(CYGPATH_W) '$(srcdir)/core/main.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'core/main.c'; then $(CYGPATH_W) 'core/main.c'; else $(CYGPATH_W) '$(srcdir)/core/main.c'; fi`
+
+ place.o: core/place.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT place.o -MD -MP -MF $(DEPDIR)/place.Tpo -c -o place.o `test -f 'core/place.c' || echo '$(srcdir)/'`core/place.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/place.Tpo $(DEPDIR)/place.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/place.Tpo $(DEPDIR)/place.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/place.c' object='place.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o place.o `test -f 'core/place.c' || echo '$(srcdir)/'`core/place.c
+
+ place.obj: core/place.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT place.obj -MD -MP -MF $(DEPDIR)/place.Tpo -c -o place.obj `if test -f 'core/place.c'; then $(CYGPATH_W) 'core/place.c'; else $(CYGPATH_W) '$(srcdir)/core/place.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/place.Tpo $(DEPDIR)/place.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/place.Tpo $(DEPDIR)/place.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/place.c' object='place.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o place.obj `if test -f 'core/place.c'; then $(CYGPATH_W) 'core/place.c'; else $(CYGPATH_W) '$(srcdir)/core/place.c'; fi`
+
+ prefs.o: core/prefs.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT prefs.o -MD -MP -MF $(DEPDIR)/prefs.Tpo -c -o prefs.o `test -f 'core/prefs.c' || echo '$(srcdir)/'`core/prefs.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/prefs.Tpo $(DEPDIR)/prefs.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/prefs.Tpo $(DEPDIR)/prefs.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/prefs.c' object='prefs.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o prefs.o `test -f 'core/prefs.c' || echo '$(srcdir)/'`core/prefs.c
+
+ prefs.obj: core/prefs.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT prefs.obj -MD -MP -MF $(DEPDIR)/prefs.Tpo -c -o prefs.obj `if test -f 'core/prefs.c'; then $(CYGPATH_W) 'core/prefs.c'; else $(CYGPATH_W) '$(srcdir)/core/prefs.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/prefs.Tpo $(DEPDIR)/prefs.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/prefs.Tpo $(DEPDIR)/prefs.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/prefs.c' object='prefs.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o prefs.obj `if test -f 'core/prefs.c'; then $(CYGPATH_W) 'core/prefs.c'; else $(CYGPATH_W) '$(srcdir)/core/prefs.c'; fi`
+
+ screen.o: core/screen.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT screen.o -MD -MP -MF $(DEPDIR)/screen.Tpo -c -o screen.o `test -f 'core/screen.c' || echo '$(srcdir)/'`core/screen.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/screen.Tpo $(DEPDIR)/screen.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/screen.Tpo $(DEPDIR)/screen.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/screen.c' object='screen.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o screen.o `test -f 'core/screen.c' || echo '$(srcdir)/'`core/screen.c
+
+ screen.obj: core/screen.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT screen.obj -MD -MP -MF $(DEPDIR)/screen.Tpo -c -o screen.obj `if test -f 'core/screen.c'; then $(CYGPATH_W) 'core/screen.c'; else $(CYGPATH_W) '$(srcdir)/core/screen.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/screen.Tpo $(DEPDIR)/screen.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/screen.Tpo $(DEPDIR)/screen.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/screen.c' object='screen.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o screen.obj `if test -f 'core/screen.c'; then $(CYGPATH_W) 'core/screen.c'; else $(CYGPATH_W) '$(srcdir)/core/screen.c'; fi`
+
+ session.o: core/session.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT session.o -MD -MP -MF $(DEPDIR)/session.Tpo -c -o session.o `test -f 'core/session.c' || echo '$(srcdir)/'`core/session.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/session.Tpo $(DEPDIR)/session.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/session.Tpo $(DEPDIR)/session.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/session.c' object='session.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o session.o `test -f 'core/session.c' || echo '$(srcdir)/'`core/session.c
+
+ session.obj: core/session.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT session.obj -MD -MP -MF $(DEPDIR)/session.Tpo -c -o session.obj `if test -f 'core/session.c'; then $(CYGPATH_W) 'core/session.c'; else $(CYGPATH_W) '$(srcdir)/core/session.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/session.Tpo $(DEPDIR)/session.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/session.Tpo $(DEPDIR)/session.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/session.c' object='session.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o session.obj `if test -f 'core/session.c'; then $(CYGPATH_W) 'core/session.c'; else $(CYGPATH_W) '$(srcdir)/core/session.c'; fi`
+
+ stack.o: core/stack.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stack.o -MD -MP -MF $(DEPDIR)/stack.Tpo -c -o stack.o `test -f 'core/stack.c' || echo '$(srcdir)/'`core/stack.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/stack.Tpo $(DEPDIR)/stack.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stack.Tpo $(DEPDIR)/stack.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/stack.c' object='stack.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stack.o `test -f 'core/stack.c' || echo '$(srcdir)/'`core/stack.c
+
+ stack.obj: core/stack.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stack.obj -MD -MP -MF $(DEPDIR)/stack.Tpo -c -o stack.obj `if test -f 'core/stack.c'; then $(CYGPATH_W) 'core/stack.c'; else $(CYGPATH_W) '$(srcdir)/core/stack.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/stack.Tpo $(DEPDIR)/stack.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stack.Tpo $(DEPDIR)/stack.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/stack.c' object='stack.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stack.obj `if test -f 'core/stack.c'; then $(CYGPATH_W) 'core/stack.c'; else $(CYGPATH_W) '$(srcdir)/core/stack.c'; fi`
+
+ stack-tracker.o: core/stack-tracker.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stack-tracker.o -MD -MP -MF $(DEPDIR)/stack-tracker.Tpo -c -o stack-tracker.o `test -f 'core/stack-tracker.c' || echo '$(srcdir)/'`core/stack-tracker.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/stack-tracker.Tpo $(DEPDIR)/stack-tracker.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stack-tracker.Tpo $(DEPDIR)/stack-tracker.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/stack-tracker.c' object='stack-tracker.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stack-tracker.o `test -f 'core/stack-tracker.c' || echo '$(srcdir)/'`core/stack-tracker.c
+
+ stack-tracker.obj: core/stack-tracker.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stack-tracker.obj -MD -MP -MF $(DEPDIR)/stack-tracker.Tpo -c -o stack-tracker.obj `if test -f 'core/stack-tracker.c'; then $(CYGPATH_W) 'core/stack-tracker.c'; else $(CYGPATH_W) '$(srcdir)/core/stack-tracker.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/stack-tracker.Tpo $(DEPDIR)/stack-tracker.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stack-tracker.Tpo $(DEPDIR)/stack-tracker.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/stack-tracker.c' object='stack-tracker.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stack-tracker.obj `if test -f 'core/stack-tracker.c'; then $(CYGPATH_W) 'core/stack-tracker.c'; else $(CYGPATH_W) '$(srcdir)/core/stack-tracker.c'; fi`
+
+ util.o: core/util.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT util.o -MD -MP -MF $(DEPDIR)/util.Tpo -c -o util.o `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/util.Tpo $(DEPDIR)/util.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/util.Tpo $(DEPDIR)/util.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/util.c' object='util.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o util.o `test -f 'core/util.c' || echo '$(srcdir)/'`core/util.c
+
+ util.obj: core/util.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT util.obj -MD -MP -MF $(DEPDIR)/util.Tpo -c -o util.obj `if test -f 'core/util.c'; then $(CYGPATH_W) 'core/util.c'; else $(CYGPATH_W) '$(srcdir)/core/util.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/util.Tpo $(DEPDIR)/util.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/util.Tpo $(DEPDIR)/util.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/util.c' object='util.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o util.obj `if test -f 'core/util.c'; then $(CYGPATH_W) 'core/util.c'; else $(CYGPATH_W) '$(srcdir)/core/util.c'; fi`
+
+ window-props.o: core/window-props.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT window-props.o -MD -MP -MF $(DEPDIR)/window-props.Tpo -c -o window-props.o `test -f 'core/window-props.c' || echo '$(srcdir)/'`core/window-props.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/window-props.Tpo $(DEPDIR)/window-props.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/window-props.Tpo $(DEPDIR)/window-props.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/window-props.c' object='window-props.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o window-props.o `test -f 'core/window-props.c' || echo '$(srcdir)/'`core/window-props.c
+
+ window-props.obj: core/window-props.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT window-props.obj -MD -MP -MF $(DEPDIR)/window-props.Tpo -c -o window-props.obj `if test -f 'core/window-props.c'; then $(CYGPATH_W) 'core/window-props.c'; else $(CYGPATH_W) '$(srcdir)/core/window-props.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/window-props.Tpo $(DEPDIR)/window-props.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/window-props.Tpo $(DEPDIR)/window-props.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/window-props.c' object='window-props.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o window-props.obj `if test -f 'core/window-props.c'; then $(CYGPATH_W) 'core/window-props.c'; else $(CYGPATH_W) '$(srcdir)/core/window-props.c'; fi`
+
+ window.o: core/window.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT window.o -MD -MP -MF $(DEPDIR)/window.Tpo -c -o window.o `test -f 'core/window.c' || echo '$(srcdir)/'`core/window.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/window.Tpo $(DEPDIR)/window.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/window.Tpo $(DEPDIR)/window.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/window.c' object='window.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o window.o `test -f 'core/window.c' || echo '$(srcdir)/'`core/window.c
+
+ window.obj: core/window.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT window.obj -MD -MP -MF $(DEPDIR)/window.Tpo -c -o window.obj `if test -f 'core/window.c'; then $(CYGPATH_W) 'core/window.c'; else $(CYGPATH_W) '$(srcdir)/core/window.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/window.Tpo $(DEPDIR)/window.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/window.Tpo $(DEPDIR)/window.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/window.c' object='window.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o window.obj `if test -f 'core/window.c'; then $(CYGPATH_W) 'core/window.c'; else $(CYGPATH_W) '$(srcdir)/core/window.c'; fi`
+
+ workspace.o: core/workspace.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workspace.o -MD -MP -MF $(DEPDIR)/workspace.Tpo -c -o workspace.o `test -f 'core/workspace.c' || echo '$(srcdir)/'`core/workspace.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/workspace.c' object='workspace.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workspace.o `test -f 'core/workspace.c' || echo '$(srcdir)/'`core/workspace.c
+
+ workspace.obj: core/workspace.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workspace.obj -MD -MP -MF $(DEPDIR)/workspace.Tpo -c -o workspace.obj `if test -f 'core/workspace.c'; then $(CYGPATH_W) 'core/workspace.c'; else $(CYGPATH_W) '$(srcdir)/core/workspace.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/workspace.c' object='workspace.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workspace.obj `if test -f 'core/workspace.c'; then $(CYGPATH_W) 'core/workspace.c'; else $(CYGPATH_W) '$(srcdir)/core/workspace.c'; fi`
+
+ xprops.o: core/xprops.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xprops.o -MD -MP -MF $(DEPDIR)/xprops.Tpo -c -o xprops.o `test -f 'core/xprops.c' || echo '$(srcdir)/'`core/xprops.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xprops.Tpo $(DEPDIR)/xprops.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xprops.Tpo $(DEPDIR)/xprops.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/xprops.c' object='xprops.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xprops.o `test -f 'core/xprops.c' || echo '$(srcdir)/'`core/xprops.c
+
+ xprops.obj: core/xprops.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xprops.obj -MD -MP -MF $(DEPDIR)/xprops.Tpo -c -o xprops.obj `if test -f 'core/xprops.c'; then $(CYGPATH_W) 'core/xprops.c'; else $(CYGPATH_W) '$(srcdir)/core/xprops.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xprops.Tpo $(DEPDIR)/xprops.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xprops.Tpo $(DEPDIR)/xprops.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/xprops.c' object='xprops.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xprops.obj `if test -f 'core/xprops.c'; then $(CYGPATH_W) 'core/xprops.c'; else $(CYGPATH_W) '$(srcdir)/core/xprops.c'; fi`
+
+ fixedtip.o: ui/fixedtip.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fixedtip.o -MD -MP -MF $(DEPDIR)/fixedtip.Tpo -c -o fixedtip.o `test -f 'ui/fixedtip.c' || echo '$(srcdir)/'`ui/fixedtip.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fixedtip.Tpo $(DEPDIR)/fixedtip.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fixedtip.Tpo $(DEPDIR)/fixedtip.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/fixedtip.c' object='fixedtip.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fixedtip.o `test -f 'ui/fixedtip.c' || echo '$(srcdir)/'`ui/fixedtip.c
+
+ fixedtip.obj: ui/fixedtip.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fixedtip.obj -MD -MP -MF $(DEPDIR)/fixedtip.Tpo -c -o fixedtip.obj `if test -f 'ui/fixedtip.c'; then $(CYGPATH_W) 'ui/fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/ui/fixedtip.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fixedtip.Tpo $(DEPDIR)/fixedtip.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fixedtip.Tpo $(DEPDIR)/fixedtip.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/fixedtip.c' object='fixedtip.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fixedtip.obj `if test -f 'ui/fixedtip.c'; then $(CYGPATH_W) 'ui/fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/ui/fixedtip.c'; fi`
+
+ frames.o: ui/frames.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frames.o -MD -MP -MF $(DEPDIR)/frames.Tpo -c -o frames.o `test -f 'ui/frames.c' || echo '$(srcdir)/'`ui/frames.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/frames.Tpo $(DEPDIR)/frames.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frames.Tpo $(DEPDIR)/frames.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/frames.c' object='frames.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frames.o `test -f 'ui/frames.c' || echo '$(srcdir)/'`ui/frames.c
+
+ frames.obj: ui/frames.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frames.obj -MD -MP -MF $(DEPDIR)/frames.Tpo -c -o frames.obj `if test -f 'ui/frames.c'; then $(CYGPATH_W) 'ui/frames.c'; else $(CYGPATH_W) '$(srcdir)/ui/frames.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/frames.Tpo $(DEPDIR)/frames.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frames.Tpo $(DEPDIR)/frames.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/frames.c' object='frames.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frames.obj `if test -f 'ui/frames.c'; then $(CYGPATH_W) 'ui/frames.c'; else $(CYGPATH_W) '$(srcdir)/ui/frames.c'; fi`
+
+ menu.o: ui/menu.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT menu.o -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.o `test -f 'ui/menu.c' || echo '$(srcdir)/'`ui/menu.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/menu.c' object='menu.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o menu.o `test -f 'ui/menu.c' || echo '$(srcdir)/'`ui/menu.c
+
+ menu.obj: ui/menu.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT menu.obj -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.obj `if test -f 'ui/menu.c'; then $(CYGPATH_W) 'ui/menu.c'; else $(CYGPATH_W) '$(srcdir)/ui/menu.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/menu.c' object='menu.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o menu.obj `if test -f 'ui/menu.c'; then $(CYGPATH_W) 'ui/menu.c'; else $(CYGPATH_W) '$(srcdir)/ui/menu.c'; fi`
+
+ metaaccellabel.o: ui/metaaccellabel.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT metaaccellabel.o -MD -MP -MF $(DEPDIR)/metaaccellabel.Tpo -c -o metaaccellabel.o `test -f 'ui/metaaccellabel.c' || echo '$(srcdir)/'`ui/metaaccellabel.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/metaaccellabel.Tpo $(DEPDIR)/metaaccellabel.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/metaaccellabel.Tpo $(DEPDIR)/metaaccellabel.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/metaaccellabel.c' object='metaaccellabel.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o metaaccellabel.o `test -f 'ui/metaaccellabel.c' || echo '$(srcdir)/'`ui/metaaccellabel.c
+
+ metaaccellabel.obj: ui/metaaccellabel.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT metaaccellabel.obj -MD -MP -MF $(DEPDIR)/metaaccellabel.Tpo -c -o metaaccellabel.obj `if test -f 'ui/metaaccellabel.c'; then $(CYGPATH_W) 'ui/metaaccellabel.c'; else $(CYGPATH_W) '$(srcdir)/ui/metaaccellabel.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/metaaccellabel.Tpo $(DEPDIR)/metaaccellabel.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/metaaccellabel.Tpo $(DEPDIR)/metaaccellabel.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/metaaccellabel.c' object='metaaccellabel.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o metaaccellabel.obj `if test -f 'ui/metaaccellabel.c'; then $(CYGPATH_W) 'ui/metaaccellabel.c'; else $(CYGPATH_W) '$(srcdir)/ui/metaaccellabel.c'; fi`
+
+ resizepopup.o: ui/resizepopup.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resizepopup.o -MD -MP -MF $(DEPDIR)/resizepopup.Tpo -c -o resizepopup.o `test -f 'ui/resizepopup.c' || echo '$(srcdir)/'`ui/resizepopup.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/resizepopup.Tpo $(DEPDIR)/resizepopup.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/resizepopup.Tpo $(DEPDIR)/resizepopup.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/resizepopup.c' object='resizepopup.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resizepopup.o `test -f 'ui/resizepopup.c' || echo '$(srcdir)/'`ui/resizepopup.c
+
+ resizepopup.obj: ui/resizepopup.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resizepopup.obj -MD -MP -MF $(DEPDIR)/resizepopup.Tpo -c -o resizepopup.obj `if test -f 'ui/resizepopup.c'; then $(CYGPATH_W) 'ui/resizepopup.c'; else $(CYGPATH_W) '$(srcdir)/ui/resizepopup.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/resizepopup.Tpo $(DEPDIR)/resizepopup.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/resizepopup.Tpo $(DEPDIR)/resizepopup.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/resizepopup.c' object='resizepopup.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resizepopup.obj `if test -f 'ui/resizepopup.c'; then $(CYGPATH_W) 'ui/resizepopup.c'; else $(CYGPATH_W) '$(srcdir)/ui/resizepopup.c'; fi`
+
+ tabpopup.o: ui/tabpopup.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tabpopup.o -MD -MP -MF $(DEPDIR)/tabpopup.Tpo -c -o tabpopup.o `test -f 'ui/tabpopup.c' || echo '$(srcdir)/'`ui/tabpopup.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tabpopup.Tpo $(DEPDIR)/tabpopup.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/tabpopup.Tpo $(DEPDIR)/tabpopup.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/tabpopup.c' object='tabpopup.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tabpopup.o `test -f 'ui/tabpopup.c' || echo '$(srcdir)/'`ui/tabpopup.c
+
+ tabpopup.obj: ui/tabpopup.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tabpopup.obj -MD -MP -MF $(DEPDIR)/tabpopup.Tpo -c -o tabpopup.obj `if test -f 'ui/tabpopup.c'; then $(CYGPATH_W) 'ui/tabpopup.c'; else $(CYGPATH_W) '$(srcdir)/ui/tabpopup.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tabpopup.Tpo $(DEPDIR)/tabpopup.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/tabpopup.Tpo $(DEPDIR)/tabpopup.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/tabpopup.c' object='tabpopup.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tabpopup.obj `if test -f 'ui/tabpopup.c'; then $(CYGPATH_W) 'ui/tabpopup.c'; else $(CYGPATH_W) '$(srcdir)/ui/tabpopup.c'; fi`
+
+ theme-parser.o: ui/theme-parser.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme-parser.o -MD -MP -MF $(DEPDIR)/theme-parser.Tpo -c -o theme-parser.o `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme-parser.Tpo $(DEPDIR)/theme-parser.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme-parser.Tpo $(DEPDIR)/theme-parser.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme-parser.c' object='theme-parser.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme-parser.o `test -f 'ui/theme-parser.c' || echo '$(srcdir)/'`ui/theme-parser.c
+
+ theme-parser.obj: ui/theme-parser.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme-parser.obj -MD -MP -MF $(DEPDIR)/theme-parser.Tpo -c -o theme-parser.obj `if test -f 'ui/theme-parser.c'; then $(CYGPATH_W) 'ui/theme-parser.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme-parser.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme-parser.Tpo $(DEPDIR)/theme-parser.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme-parser.Tpo $(DEPDIR)/theme-parser.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme-parser.c' object='theme-parser.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme-parser.obj `if test -f 'ui/theme-parser.c'; then $(CYGPATH_W) 'ui/theme-parser.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme-parser.c'; fi`
+
+ theme.o: ui/theme.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme.o -MD -MP -MF $(DEPDIR)/theme.Tpo -c -o theme.o `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme.Tpo $(DEPDIR)/theme.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme.Tpo $(DEPDIR)/theme.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme.c' object='theme.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme.o `test -f 'ui/theme.c' || echo '$(srcdir)/'`ui/theme.c
+
+ theme.obj: ui/theme.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme.obj -MD -MP -MF $(DEPDIR)/theme.Tpo -c -o theme.obj `if test -f 'ui/theme.c'; then $(CYGPATH_W) 'ui/theme.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme.Tpo $(DEPDIR)/theme.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme.Tpo $(DEPDIR)/theme.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme.c' object='theme.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme.obj `if test -f 'ui/theme.c'; then $(CYGPATH_W) 'ui/theme.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme.c'; fi`
+
+ themewidget.o: ui/themewidget.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT themewidget.o -MD -MP -MF $(DEPDIR)/themewidget.Tpo -c -o themewidget.o `test -f 'ui/themewidget.c' || echo '$(srcdir)/'`ui/themewidget.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/themewidget.Tpo $(DEPDIR)/themewidget.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/themewidget.Tpo $(DEPDIR)/themewidget.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/themewidget.c' object='themewidget.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o themewidget.o `test -f 'ui/themewidget.c' || echo '$(srcdir)/'`ui/themewidget.c
+
+ themewidget.obj: ui/themewidget.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT themewidget.obj -MD -MP -MF $(DEPDIR)/themewidget.Tpo -c -o themewidget.obj `if test -f 'ui/themewidget.c'; then $(CYGPATH_W) 'ui/themewidget.c'; else $(CYGPATH_W) '$(srcdir)/ui/themewidget.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/themewidget.Tpo $(DEPDIR)/themewidget.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/themewidget.Tpo $(DEPDIR)/themewidget.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/themewidget.c' object='themewidget.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o themewidget.obj `if test -f 'ui/themewidget.c'; then $(CYGPATH_W) 'ui/themewidget.c'; else $(CYGPATH_W) '$(srcdir)/ui/themewidget.c'; fi`
+
+ ui.o: ui/ui.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ui.o -MD -MP -MF $(DEPDIR)/ui.Tpo -c -o ui.o `test -f 'ui/ui.c' || echo '$(srcdir)/'`ui/ui.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ui.Tpo $(DEPDIR)/ui.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ui.Tpo $(DEPDIR)/ui.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/ui.c' object='ui.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ui.o `test -f 'ui/ui.c' || echo '$(srcdir)/'`ui/ui.c
+
+ ui.obj: ui/ui.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ui.obj -MD -MP -MF $(DEPDIR)/ui.Tpo -c -o ui.obj `if test -f 'ui/ui.c'; then $(CYGPATH_W) 'ui/ui.c'; else $(CYGPATH_W) '$(srcdir)/ui/ui.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ui.Tpo $(DEPDIR)/ui.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ui.Tpo $(DEPDIR)/ui.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/ui.c' object='ui.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ui.obj `if test -f 'ui/ui.c'; then $(CYGPATH_W) 'ui/ui.c'; else $(CYGPATH_W) '$(srcdir)/ui/ui.c'; fi`
+
+ theme-viewer.o: ui/theme-viewer.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme-viewer.o -MD -MP -MF $(DEPDIR)/theme-viewer.Tpo -c -o theme-viewer.o `test -f 'ui/theme-viewer.c' || echo '$(srcdir)/'`ui/theme-viewer.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme-viewer.Tpo $(DEPDIR)/theme-viewer.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme-viewer.Tpo $(DEPDIR)/theme-viewer.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme-viewer.c' object='theme-viewer.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme-viewer.o `test -f 'ui/theme-viewer.c' || echo '$(srcdir)/'`ui/theme-viewer.c
+
+ theme-viewer.obj: ui/theme-viewer.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT theme-viewer.obj -MD -MP -MF $(DEPDIR)/theme-viewer.Tpo -c -o theme-viewer.obj `if test -f 'ui/theme-viewer.c'; then $(CYGPATH_W) 'ui/theme-viewer.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme-viewer.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/theme-viewer.Tpo $(DEPDIR)/theme-viewer.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/theme-viewer.Tpo $(DEPDIR)/theme-viewer.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/theme-viewer.c' object='theme-viewer.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o theme-viewer.obj `if test -f 'ui/theme-viewer.c'; then $(CYGPATH_W) 'ui/theme-viewer.c'; else $(CYGPATH_W) '$(srcdir)/ui/theme-viewer.c'; fi`
+
+ testasyncgetprop.o: core/testasyncgetprop.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testasyncgetprop.o -MD -MP -MF $(DEPDIR)/testasyncgetprop.Tpo -c -o testasyncgetprop.o `test -f 'core/testasyncgetprop.c' || echo '$(srcdir)/'`core/testasyncgetprop.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testasyncgetprop.Tpo $(DEPDIR)/testasyncgetprop.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testasyncgetprop.Tpo $(DEPDIR)/testasyncgetprop.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/testasyncgetprop.c' object='testasyncgetprop.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testasyncgetprop.o `test -f 'core/testasyncgetprop.c' || echo '$(srcdir)/'`core/testasyncgetprop.c
+
+ testasyncgetprop.obj: core/testasyncgetprop.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testasyncgetprop.obj -MD -MP -MF $(DEPDIR)/testasyncgetprop.Tpo -c -o testasyncgetprop.obj `if test -f 'core/testasyncgetprop.c'; then $(CYGPATH_W) 'core/testasyncgetprop.c'; else $(CYGPATH_W) '$(srcdir)/core/testasyncgetprop.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testasyncgetprop.Tpo $(DEPDIR)/testasyncgetprop.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testasyncgetprop.Tpo $(DEPDIR)/testasyncgetprop.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/testasyncgetprop.c' object='testasyncgetprop.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testasyncgetprop.obj `if test -f 'core/testasyncgetprop.c'; then $(CYGPATH_W) 'core/testasyncgetprop.c'; else $(CYGPATH_W) '$(srcdir)/core/testasyncgetprop.c'; fi`
+
+ testboxes.o: core/testboxes.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testboxes.o -MD -MP -MF $(DEPDIR)/testboxes.Tpo -c -o testboxes.o `test -f 'core/testboxes.c' || echo '$(srcdir)/'`core/testboxes.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testboxes.Tpo $(DEPDIR)/testboxes.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testboxes.Tpo $(DEPDIR)/testboxes.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/testboxes.c' object='testboxes.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testboxes.o `test -f 'core/testboxes.c' || echo '$(srcdir)/'`core/testboxes.c
+
+ testboxes.obj: core/testboxes.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testboxes.obj -MD -MP -MF $(DEPDIR)/testboxes.Tpo -c -o testboxes.obj `if test -f 'core/testboxes.c'; then $(CYGPATH_W) 'core/testboxes.c'; else $(CYGPATH_W) '$(srcdir)/core/testboxes.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testboxes.Tpo $(DEPDIR)/testboxes.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testboxes.Tpo $(DEPDIR)/testboxes.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='core/testboxes.c' object='testboxes.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testboxes.obj `if test -f 'core/testboxes.c'; then $(CYGPATH_W) 'core/testboxes.c'; else $(CYGPATH_W) '$(srcdir)/core/testboxes.c'; fi`
+
+ testgradient.o: ui/testgradient.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testgradient.o -MD -MP -MF $(DEPDIR)/testgradient.Tpo -c -o testgradient.o `test -f 'ui/testgradient.c' || echo '$(srcdir)/'`ui/testgradient.c
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testgradient.Tpo $(DEPDIR)/testgradient.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testgradient.Tpo $(DEPDIR)/testgradient.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/testgradient.c' object='testgradient.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testgradient.o `test -f 'ui/testgradient.c' || echo '$(srcdir)/'`ui/testgradient.c
+
+ testgradient.obj: ui/testgradient.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testgradient.obj -MD -MP -MF $(DEPDIR)/testgradient.Tpo -c -o testgradient.obj `if test -f 'ui/testgradient.c'; then $(CYGPATH_W) 'ui/testgradient.c'; else $(CYGPATH_W) '$(srcdir)/ui/testgradient.c'; fi`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testgradient.Tpo $(DEPDIR)/testgradient.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testgradient.Tpo $(DEPDIR)/testgradient.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui/testgradient.c' object='testgradient.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testgradient.obj `if test -f 'ui/testgradient.c'; then $(CYGPATH_W) 'ui/testgradient.c'; else $(CYGPATH_W) '$(srcdir)/ui/testgradient.c'; fi`
+@@ -1647,143 +1587,122 @@
+ install-desktopfilesDATA: $(desktopfiles_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(desktopfilesdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfilesdir)"
+- @list='$(desktopfiles_DATA)'; test -n "$(desktopfilesdir)" || list=; \
+- for p in $$list; do \
++ @list='$(desktopfiles_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopfilesdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopfilesdir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(desktopfilesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopfilesdir)/$$f'"; \
++ $(desktopfilesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopfilesdir)/$$f"; \
+ done
+
+ uninstall-desktopfilesDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(desktopfiles_DATA)'; test -n "$(desktopfilesdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(desktopfilesdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(desktopfilesdir)" && rm -f $$files
++ @list='$(desktopfiles_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(desktopfilesdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(desktopfilesdir)/$$f"; \
++ done
+ install-girDATA: $(gir_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
+- @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+- for p in $$list; do \
++ @list='$(gir_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(girDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(girdir)/$$f'"; \
++ $(girDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(girdir)/$$f"; \
+ done
+
+ uninstall-girDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(girdir)" && rm -f $$files
++ @list='$(gir_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(girdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(girdir)/$$f"; \
++ done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+- @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+- for p in $$list; do \
++ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
++ 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)'; test -n "$(pkgconfigdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
++ @list='$(pkgconfig_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
++ done
+ install-schemaDATA: $(schema_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
+- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+- for p in $$list; do \
++ @list='$(schema_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \
++ $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \
+ done
+
+ uninstall-schemaDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(schemadir)" && rm -f $$files
++ @list='$(schema_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \
++ rm -f "$(DESTDIR)$(schemadir)/$$f"; \
++ done
+ install-typelibDATA: $(typelib_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
+- @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+- for p in $$list; do \
++ @list='$(typelib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(typelibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(typelibdir)/$$f'"; \
++ $(typelibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(typelibdir)/$$f"; \
+ done
+
+ uninstall-typelibDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(typelibdir)" && rm -f $$files
++ @list='$(typelib_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(typelibdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(typelibdir)/$$f"; \
++ done
+ install-wmpropertiesDATA: $(wmproperties_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(wmpropertiesdir)" || $(MKDIR_P) "$(DESTDIR)$(wmpropertiesdir)"
+- @list='$(wmproperties_DATA)'; test -n "$(wmpropertiesdir)" || list=; \
+- for p in $$list; do \
++ @list='$(wmproperties_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(wmpropertiesdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(wmpropertiesdir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(wmpropertiesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(wmpropertiesdir)/$$f'"; \
++ $(wmpropertiesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(wmpropertiesdir)/$$f"; \
+ done
+
+ uninstall-wmpropertiesDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(wmproperties_DATA)'; test -n "$(wmpropertiesdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(wmpropertiesdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(wmpropertiesdir)" && rm -f $$files
++ @list='$(wmproperties_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(wmpropertiesdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(wmpropertiesdir)/$$f"; \
++ done
+ install-libmutterincludeHEADERS: $(libmutterinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libmutterincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmutterincludedir)"
+- @list='$(libmutterinclude_HEADERS)'; test -n "$(libmutterincludedir)" || list=; \
+- for p in $$list; do \
++ @list='$(libmutterinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libmutterincludedir)'"; \
+- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libmutterincludedir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(libmutterincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libmutterincludedir)/$$f'"; \
++ $(libmutterincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libmutterincludedir)/$$f"; \
+ done
+
+ uninstall-libmutterincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(libmutterinclude_HEADERS)'; test -n "$(libmutterincludedir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(libmutterincludedir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(libmutterincludedir)" && rm -f $$files
++ @list='$(libmutterinclude_HEADERS)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(libmutterincludedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(libmutterincludedir)/$$f"; \
++ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -1809,7 +1728,7 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+@@ -1843,16 +1762,16 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -1867,7 +1786,7 @@
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- set x; \
++ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+@@ -1879,7 +1798,7 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -1888,34 +1807,29 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
+ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
++ tags=; \
+ 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; nonemtpy = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-Index: metacity-2.26.0/src/themes/Makefile.in
+- test -z "$(CTAGS_ARGS)$$unique" \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
++ $$tags $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -1936,44 +1850,29 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+- $(am__relativize); \
+- new_distdir=$$reldir; \
+- dir1=$$subdir; dir2="$(top_distdir)"; \
+- $(am__relativize); \
+- new_top_distdir=$$reldir; \
+- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+- ($(am__cd) $$subdir && \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$new_top_distdir" \
+- distdir="$$new_distdir" \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+- am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -2011,7 +1910,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -2034,8 +1932,6 @@
+
+ html: html-recursive
+
+-html-am:
+-
+ info: info-recursive
+
+ info-am:
+@@ -2047,28 +1943,18 @@
+
+ install-dvi: install-dvi-recursive
+
+-install-dvi-am:
+-
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+ install-html: install-html-recursive
+
+-install-html-am:
+-
+ install-info: install-info-recursive
+
+-install-info-am:
+-
+ install-man:
+
+ install-pdf: install-pdf-recursive
+
+-install-pdf-am:
+-
+ install-ps: install-ps-recursive
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -2095,9 +1981,8 @@
+ uninstall-schemaDATA uninstall-typelibDATA \
+ uninstall-wmpropertiesDATA
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+- ctags-recursive install install-am install-strip \
+- tags-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-binPROGRAMS \
+@@ -2200,7 +2085,6 @@
+ $(libmutterinclude_base_headers) ) >> xgen-tetc && \
+ cp xgen-tetc mutter-enum-types.c && \
+ rm -f xgen-tetc
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: mutter-2.27.1/src/tools/Makefile.in
===================================================================
---- metacity-2.26.0.orig/src/themes/Makefile.in 2009-06-10 21:51:17.585410323 +0200
-+++ metacity-2.26.0/src/themes/Makefile.in 2009-06-10 21:50:29.621903787 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/src/tools/Makefile.in 2009-07-17 00:02:01.000000000 +0200
++++ mutter-2.27.1/src/tools/Makefile.in 2009-07-26 13:23:03.821790239 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -95,29 +95,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -221,6 +202,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- THEMES = \
-@@ -241,8 +223,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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.
+@@ -18,9 +17,8 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -46,8 +44,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(icondir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_mutter_grayscale_OBJECTS = mutter-grayscale.$(OBJEXT)
+ mutter_grayscale_OBJECTS = $(am_mutter_grayscale_OBJECTS)
+@@ -64,7 +62,6 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -83,22 +80,8 @@
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+- if (++n[$$2] == $(am__install_max)) \
+- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+- END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++iconDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(icon_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -321,9 +304,9 @@
exit 1;; \
esac; \
done; \
-Index: metacity-2.26.0/src/tools/Makefile.in
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/tools/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/tools/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -341,59 +324,41 @@
+ 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
+-$(am__aclocal_m4_deps):
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed 's/$(EXEEXT)$$//' | \
+- while read p p1; do if test -f $$p || test -f $$p1; \
+- then echo "$$p"; echo "$$p"; else :; fi; \
+- done | \
+- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+- sed 'N;N;N;s,\n, ,g' | \
+- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+- if ($$2 == $$4) files[d] = files[d] " " $$1; \
+- else { print "f", $$3 "/" $$4, $$1; } } \
+- END { for (d in files) print "f", d, files[d] }' | \
+- while read type dir files; do \
+- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+- test -z "$$files" || { \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+- } \
+- ; done
++ @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) $(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
+
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+- files=`for p in $$list; do echo "$$p"; done | \
+- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+- -e 's/$$/$(EXEEXT)/' `; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(bindir)" && rm -f $$files
++ @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"; \
++ done
+
+ clean-binPROGRAMS:
+- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
+
+ clean-noinstPROGRAMS:
+- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
+ mutter-grayscale$(EXEEXT): $(mutter_grayscale_OBJECTS) $(mutter_grayscale_DEPENDENCIES)
+ @rm -f mutter-grayscale$(EXEEXT)
+ $(LINK) $(mutter_grayscale_OBJECTS) $(mutter_grayscale_LDADD) $(LIBS)
+@@ -420,21 +385,21 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -447,23 +412,20 @@
+ install-iconDATA: $(icon_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+- for p in $$list; do \
++ @list='$(icon_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
++ f=$(am__strip_dir) \
++ echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
++ $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+ done
+
+ uninstall-iconDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(icondir)" && rm -f $$files
++ @list='$(icon_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
++ rm -f "$(DESTDIR)$(icondir)/$$f"; \
++ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -477,7 +439,7 @@
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- set x; \
++ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -485,34 +447,29 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
++ tags=; \
+ 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; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$unique" \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
++ $$tags $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -533,17 +490,13 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+@@ -574,7 +527,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -596,8 +548,6 @@
+
+ html: html-am
+
+-html-am:
+-
+ info: info-am
+
+ info-am:
+@@ -606,28 +556,18 @@
+
+ install-dvi: install-dvi-am
+
+-install-dvi-am:
+-
+ install-exec-am: install-binPROGRAMS
+
+ install-html: install-html-am
+
+-install-html-am:
+-
+ install-info: install-info-am
+
+-install-info-am:
+-
+ install-man:
+
+ install-pdf: install-pdf-am
+
+-install-pdf-am:
+-
+ install-ps: install-ps-am
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -668,7 +608,6 @@
+ uninstall-binPROGRAMS uninstall-iconDATA
+
+ @INTLTOOL_DESKTOP_RULE@
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: mutter-2.27.1/src/wm-tester/Makefile.in
===================================================================
---- metacity-2.26.0.orig/src/tools/Makefile.in 2009-06-10 21:51:18.657413257 +0200
-+++ metacity-2.26.0/src/tools/Makefile.in 2009-06-10 21:50:29.745903126 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- mutter-2.27.1.orig/src/wm-tester/Makefile.in 2009-07-17 00:02:01.000000000 +0200
++++ mutter-2.27.1/src/wm-tester/Makefile.in 2009-07-26 13:23:03.901790900 +0200
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -138,29 +138,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -264,6 +245,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- icondir = $(pkgdatadir)/icons
-@@ -297,8 +279,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 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.
+@@ -17,9 +16,8 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -46,7 +44,6 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_focus_window_OBJECTS = focus-window.$(OBJEXT)
+ focus_window_OBJECTS = $(am_focus_window_OBJECTS)
+@@ -66,7 +63,6 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -301,9 +297,9 @@
exit 1;; \
esac; \
done; \
-@@ -430,7 +412,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/wm-tester/Makefile'; \
+- $(am__cd) $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/wm-tester/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/wm-tester/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/wm-tester/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -321,16 +317,13 @@
+ 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
+-$(am__aclocal_m4_deps):
+
+ clean-noinstPROGRAMS:
+- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
+ focus-window$(EXEEXT): $(focus_window_OBJECTS) $(focus_window_DEPENDENCIES)
+ @rm -f focus-window$(EXEEXT)
+ $(LINK) $(focus_window_OBJECTS) $(focus_window_LDADD) $(LIBS)
+@@ -361,21 +354,21 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -398,7 +391,7 @@
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- set x; \
++ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -406,34 +399,29 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
++ tags=; \
+ 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; nonemtpy = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-Index: metacity-2.26.0/src/wm-tester/Makefile.in
-===================================================================
---- metacity-2.26.0.orig/src/wm-tester/Makefile.in 2009-06-10 21:51:18.845907318 +0200
-+++ metacity-2.26.0/src/wm-tester/Makefile.in 2009-06-10 21:50:29.865905322 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.10.2 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -133,29 +133,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -259,6 +240,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = @METACITY_CFLAGS@
-@@ -290,8 +272,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-- && exit 0; \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
-@@ -382,7 +364,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+- test -z "$(CTAGS_ARGS)$$unique" \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
++ $$tags $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -454,17 +442,13 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test -d "$(distdir)/$$file"; then \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+- fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+- test -f "$(distdir)/$$file" \
+- || cp -p $$d/$$file "$(distdir)/$$file" \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+@@ -492,7 +476,6 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -514,8 +497,6 @@
+
+ html: html-am
+
+-html-am:
+-
+ info: info-am
+
+ info-am:
+@@ -524,28 +505,18 @@
+
+ install-dvi: install-dvi-am
+
+-install-dvi-am:
+-
+ install-exec-am:
+
+ install-html: install-html-am
+
+-install-html-am:
+-
+ install-info: install-info-am
+
+-install-info-am:
+-
+ install-man:
+
+ install-pdf: install-pdf-am
+
+-install-pdf-am:
+-
+ install-ps: install-ps-am
+
+-install-ps-am:
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -583,7 +554,6 @@
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Modified: packages/unstable/mutter/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mutter/debian/patches/99_ltmain_as-needed.patch?rev=20791&op=diff
==============================================================================
--- packages/unstable/mutter/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ packages/unstable/mutter/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Jul 26 11:24:24 2009
@@ -1,8 +1,8 @@
-Index: metacity-2.26.0/ltmain.sh
+Index: mutter-2.27.1/ltmain.sh
===================================================================
---- metacity-2.26.0.orig/ltmain.sh 2009-06-10 21:49:59.573656104 +0200
-+++ metacity-2.26.0/ltmain.sh 2009-06-10 21:52:17.821406220 +0200
-@@ -1684,6 +1684,11 @@ func_mode_execute ()
+--- mutter-2.27.1.orig/ltmain.sh 2009-07-26 13:22:50.645790616 +0200
++++ mutter-2.27.1/ltmain.sh 2009-07-26 13:23:14.265327137 +0200
+@@ -1684,6 +1684,11 @@
func_dirname "$file" "" "."
dir="$func_dirname_result"
;;
@@ -14,7 +14,7 @@
*)
func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-@@ -5070,6 +5075,15 @@ func_mode_link ()
+@@ -5074,6 +5079,15 @@
lib=
found=no
case $deplib in
More information about the pkg-gnome-commits
mailing list