Use dh-autoreconf

6 files changed, 12 insertions, 14304 deletions

diff --git a/debian/changelog b/debian/changelog
index da26c58..d75c999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,7 @@ cairo (1.10.0-1) experimental; urgency=low
       - Update symbols and shlibs to the stable version.
     + debian/control:
       - Update pixman build dependency to >= 0.18.4.
-    + debian/patches/01_build_perf_utils.patch,
-      debian/patches/99_autoreconf.patch:
+    + debian/patches/01_build_perf_utils.patch:
       - Refreshed.
     + debian/control,
       debian/libcairo-gobject2.symbols,
@@ -36,8 +35,12 @@ cairo (1.10.0-1) experimental; urgency=low
     + debian/patches/02_am-maintainer-mode.patch:
       - Add AM_MAINTAINER_MODE again to configure.ac to
         prevent build problems.
+    + debian/control,
+      debian/rules:
+      - Use dh-autoreconf instead of an autoreconf patch. cairo's
+        build system doesn't like patches...
 
- -- Sebastian Dröge <slomo@debian.org>  Mon, 06 Sep 2010 21:52:00 +0200
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 07 Sep 2010 10:09:10 +0200
 
 cairo (1.9.14-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 371a4ee..c6a7f56 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Dave Beckett <dajobe@debian.org>
 Uploaders: Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 7),
                dpkg-dev (>= 1.14.13),
+               dh-autoreconf,
                pkg-config (>= 0.19),
                libfontconfig1-dev (>= 2.2.95),
                libfreetype6-dev (>= 2.1.10),
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/ltmain_as-needed.patch
index 9a3146b..9a3146b 100644
--- a/debian/patches/99_ltmain_as-needed.patch
+++ b/debian/ltmain_as-needed.patch
diff --git a/debian/patches/99_autoreconf.patch b/debian/patches/99_autoreconf.patch
deleted file mode 100644
index 3ab7fc1..0000000
--- a/debian/patches/99_autoreconf.patch
+++ /dev/null
@@ -1,14299 +0,0 @@
-Index: cairo/aclocal.m4
-===================================================================
---- cairo.orig/aclocal.m4	2010-09-06 23:50:28.867420664 +0200
-+++ cairo/aclocal.m4	2010-09-06 23:50:04.211431561 +0200
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
--[m4_warning([this file was generated for autoconf 2.66.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-+[m4_warning([this file was generated for autoconf 2.67.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -587,6 +587,46 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 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 5
-+
-+# 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@_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
-+			  (and sometimes confusing) to the casual installer],
-+      [USE_MAINTAINER_MODE=$enableval],
-+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST([MAINT])dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-Index: cairo/boilerplate/Makefile.am.features
-===================================================================
---- cairo.orig/boilerplate/Makefile.am.features	2010-09-06 23:50:20.271408717 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,499 +0,0 @@
--# Generated by configure.  Do not edit.
--
--include $(top_srcdir)/boilerplate/Makefile.sources
--
--supported_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
--unsupported_cairo_boilerplate_headers =
--all_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
--all_cairo_boilerplate_private = $(cairo_boilerplate_private)
--all_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources)
--all_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
--
--enabled_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
--enabled_cairo_boilerplate_private = $(cairo_boilerplate_private)
--enabled_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources)
--enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
--
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
--if CAIRO_HAS_XLIB_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xrender_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
--if CAIRO_HAS_XLIB_XRENDER_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xrender_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
--if CAIRO_HAS_XCB_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xcb_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xcb_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xcb_sources)
--if CAIRO_HAS_XLIB_XCB_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xcb_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xcb_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xcb_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_shm_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_shm_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_shm_sources)
--if CAIRO_HAS_XCB_SHM_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_shm_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_shm_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_shm_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_qt_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_qt_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_qt_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_qt_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_qt_sources)
--if CAIRO_HAS_QT_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_qt_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_qt_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_qt_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_qt_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
--if CAIRO_HAS_QUARTZ_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_font_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
--if CAIRO_HAS_QUARTZ_FONT
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_font_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_image_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
--if CAIRO_HAS_QUARTZ_IMAGE_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_image_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
--if CAIRO_HAS_WIN32_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_font_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
--if CAIRO_HAS_WIN32_FONT
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_font_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_skia_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_skia_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_skia_sources)
--if CAIRO_HAS_SKIA_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_skia_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_skia_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_skia_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_skia_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_os2_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
--if CAIRO_HAS_OS2_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_os2_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_beos_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
--if CAIRO_HAS_BEOS_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_beos_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_drm_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_drm_sources)
--if CAIRO_HAS_DRM_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_drm_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_drm_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_drm_xr_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_drm_xr_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_drm_xr_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_xr_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_drm_xr_sources)
--if CAIRO_HAS_DRM_XR_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_drm_xr_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_drm_xr_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_xr_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_drm_xr_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_gallium_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gallium_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_gallium_sources)
--if CAIRO_HAS_GALLIUM_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_gallium_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gallium_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gallium_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_drm_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_drm_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_drm_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_drm_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_drm_sources)
--if CAIRO_HAS_XCB_DRM_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_drm_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_drm_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_drm_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_drm_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_png_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
--if CAIRO_HAS_PNG_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_png_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_gl_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gl_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources)
--if CAIRO_HAS_GL_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gl_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_directfb_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
--if CAIRO_HAS_DIRECTFB_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_directfb_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_vg_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
--if CAIRO_HAS_VG_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_vg_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_egl_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_egl_sources)
--if CAIRO_HAS_EGL_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_egl_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_egl_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_glx_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glx_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_glx_sources)
--if CAIRO_HAS_GLX_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_glx_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glx_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glx_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_wgl_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources)
--if CAIRO_HAS_WGL_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_wgl_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_script_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
--if CAIRO_HAS_SCRIPT_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_script_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ft_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
--if CAIRO_HAS_FT_FONT
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ft_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_fc_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_fc_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_fc_sources)
--if CAIRO_HAS_FC_FONT
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_fc_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_fc_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_fc_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ps_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
--if CAIRO_HAS_PS_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ps_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pdf_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
--if CAIRO_HAS_PDF_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pdf_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_svg_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
--if CAIRO_HAS_SVG_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_svg_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
--endif
--
--all_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_test_surfaces_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
--if CAIRO_HAS_TEST_SURFACES
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_test_surfaces_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_image_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_image_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_recording_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources)
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_recording_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources)
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_tee_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)
--if CAIRO_HAS_TEE_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_tee_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)
--endif
--
--unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_xml_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_xml_sources)
--if CAIRO_HAS_XML_SURFACE
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_xml_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xml_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_user_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_user_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
--
--all_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
--if CAIRO_HAS_PTHREAD
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
--endif
--
--supported_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
--all_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
--all_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)
--if CAIRO_HAS_GOBJECT_FUNCTIONS
--enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)
--endif
--
--all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
--if CAIRO_HAS_TRACE
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
--endif
--
--all_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_interpreter_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources)
--if CAIRO_HAS_INTERPRETER
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_interpreter_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources)
--endif
--
--all_cairo_boilerplate_private += $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers)
--all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_symbol_lookup_cxx_sources)
--all_cairo_boilerplate_sources += $(cairo_boilerplate_symbol_lookup_sources)
--if CAIRO_HAS_SYMBOL_LOOKUP
--enabled_cairo_boilerplate_private += $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers)
--enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_symbol_lookup_cxx_sources)
--enabled_cairo_boilerplate_sources += $(cairo_boilerplate_symbol_lookup_sources)
--endif
-Index: cairo/boilerplate/Makefile.in
-===================================================================
---- cairo.orig/boilerplate/Makefile.in	2010-09-06 23:50:20.375407695 +0200
-+++ cairo/boilerplate/Makefile.in	2010-09-06 23:50:07.299406293 +0200
-@@ -16,14 +16,6 @@
- @SET_MAKE@
- 
- # Note: All source files are listed in Makefile.sources.
--
--# Generated by configure.  Do not edit.
--
--# Makefile.sources
--#
--# This file is pretty similar to $(top_srcdir)/src/Makefile.sources,
--# but for boilerplate.  Unlike that file, there are no special headers.
--#
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -45,164 +37,12 @@
- host_triplet = @host@
- DIST_COMMON = README $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.am.features $(srcdir)/Makefile.in \
--	$(top_srcdir)/boilerplate/Makefile.sources \
- 	$(top_srcdir)/build/Makefile.am.common
- EXTRA_PROGRAMS =
- check_PROGRAMS = check-link$(EXEEXT)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_1 = $(cairo_boilerplate_xlib_headers)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_2 = $(cairo_boilerplate_xlib_private)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_3 = $(cairo_boilerplate_xlib_cxx_sources)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_4 = $(cairo_boilerplate_xlib_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_5 = $(cairo_boilerplate_xlib_xrender_headers)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_6 = $(cairo_boilerplate_xlib_xrender_private)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_7 = $(cairo_boilerplate_xlib_xrender_cxx_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_8 = $(cairo_boilerplate_xlib_xrender_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_9 = $(cairo_boilerplate_xcb_headers)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_10 = $(cairo_boilerplate_xcb_private)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_11 = $(cairo_boilerplate_xcb_cxx_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_12 = $(cairo_boilerplate_xcb_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_13 = $(cairo_boilerplate_xlib_xcb_headers)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_14 = $(cairo_boilerplate_xlib_xcb_private)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_15 = $(cairo_boilerplate_xlib_xcb_cxx_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_16 = $(cairo_boilerplate_xlib_xcb_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_17 = $(cairo_boilerplate_xcb_shm_headers)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_18 = $(cairo_boilerplate_xcb_shm_private)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_19 = $(cairo_boilerplate_xcb_shm_cxx_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_20 = $(cairo_boilerplate_xcb_shm_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_21 = $(cairo_boilerplate_qt_headers)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_22 = $(cairo_boilerplate_qt_private)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_23 = $(cairo_boilerplate_qt_cxx_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_24 = $(cairo_boilerplate_qt_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_25 = $(cairo_boilerplate_quartz_headers)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_26 = $(cairo_boilerplate_quartz_private)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_27 = $(cairo_boilerplate_quartz_cxx_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_28 = $(cairo_boilerplate_quartz_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_29 = $(cairo_boilerplate_quartz_font_headers)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_30 = $(cairo_boilerplate_quartz_font_private)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_31 = $(cairo_boilerplate_quartz_font_cxx_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_32 = $(cairo_boilerplate_quartz_font_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_33 = $(cairo_boilerplate_quartz_image_headers)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_34 = $(cairo_boilerplate_quartz_image_private)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_35 = $(cairo_boilerplate_quartz_image_cxx_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_36 = $(cairo_boilerplate_quartz_image_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_37 = $(cairo_boilerplate_win32_headers)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_38 = $(cairo_boilerplate_win32_private)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_39 = $(cairo_boilerplate_win32_cxx_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_40 = $(cairo_boilerplate_win32_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_41 = $(cairo_boilerplate_win32_font_headers)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_42 = $(cairo_boilerplate_win32_font_private)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_43 = $(cairo_boilerplate_win32_font_cxx_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_44 = $(cairo_boilerplate_win32_font_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_45 = $(cairo_boilerplate_skia_headers)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_46 = $(cairo_boilerplate_skia_private)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_47 = $(cairo_boilerplate_skia_cxx_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_48 = $(cairo_boilerplate_skia_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_49 = $(cairo_boilerplate_os2_headers)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_50 = $(cairo_boilerplate_os2_private)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_51 = $(cairo_boilerplate_os2_cxx_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_52 = $(cairo_boilerplate_os2_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_53 = $(cairo_boilerplate_beos_headers)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_54 = $(cairo_boilerplate_beos_private)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_55 = $(cairo_boilerplate_beos_cxx_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_56 = $(cairo_boilerplate_beos_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_57 = $(cairo_boilerplate_drm_headers)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_58 = $(cairo_boilerplate_drm_private)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_59 = $(cairo_boilerplate_drm_cxx_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_60 = $(cairo_boilerplate_drm_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_61 = $(cairo_boilerplate_drm_xr_headers)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_62 = $(cairo_boilerplate_drm_xr_private)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_63 = $(cairo_boilerplate_drm_xr_cxx_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_64 = $(cairo_boilerplate_drm_xr_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_65 = $(cairo_boilerplate_gallium_headers)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_66 = $(cairo_boilerplate_gallium_private)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_67 = $(cairo_boilerplate_gallium_cxx_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_68 = $(cairo_boilerplate_gallium_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_69 = $(cairo_boilerplate_xcb_drm_headers)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_70 = $(cairo_boilerplate_xcb_drm_private)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_71 = $(cairo_boilerplate_xcb_drm_cxx_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_72 = $(cairo_boilerplate_xcb_drm_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_73 = $(cairo_boilerplate_png_headers)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_74 = $(cairo_boilerplate_png_private)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_75 = $(cairo_boilerplate_png_cxx_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_76 = $(cairo_boilerplate_png_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_77 = $(cairo_boilerplate_gl_headers)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_78 = $(cairo_boilerplate_gl_private)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_79 = $(cairo_boilerplate_gl_cxx_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_80 = $(cairo_boilerplate_gl_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_81 = $(cairo_boilerplate_directfb_headers)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_82 = $(cairo_boilerplate_directfb_private)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_83 = $(cairo_boilerplate_directfb_cxx_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_84 = $(cairo_boilerplate_directfb_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_85 = $(cairo_boilerplate_vg_headers)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_86 = $(cairo_boilerplate_vg_private)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_87 = $(cairo_boilerplate_vg_cxx_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_88 = $(cairo_boilerplate_vg_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_89 = $(cairo_boilerplate_egl_headers)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_90 = $(cairo_boilerplate_egl_private)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_91 = $(cairo_boilerplate_egl_cxx_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_92 = $(cairo_boilerplate_egl_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_93 = $(cairo_boilerplate_glx_headers)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_94 = $(cairo_boilerplate_glx_private)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_95 = $(cairo_boilerplate_glx_cxx_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_96 = $(cairo_boilerplate_glx_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_97 = $(cairo_boilerplate_wgl_headers)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_98 = $(cairo_boilerplate_wgl_private)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_99 = $(cairo_boilerplate_wgl_cxx_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_100 = $(cairo_boilerplate_wgl_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_101 = $(cairo_boilerplate_script_headers)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_102 = $(cairo_boilerplate_script_private)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_103 = $(cairo_boilerplate_script_cxx_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_104 = $(cairo_boilerplate_script_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_105 = $(cairo_boilerplate_ft_headers)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_106 = $(cairo_boilerplate_ft_private)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_107 = $(cairo_boilerplate_ft_cxx_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_108 = $(cairo_boilerplate_ft_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_109 = $(cairo_boilerplate_fc_headers)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_110 = $(cairo_boilerplate_fc_private)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_111 = $(cairo_boilerplate_fc_cxx_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_112 = $(cairo_boilerplate_fc_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_113 = $(cairo_boilerplate_ps_headers)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_114 = $(cairo_boilerplate_ps_private)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_115 = $(cairo_boilerplate_ps_cxx_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_116 = $(cairo_boilerplate_ps_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_117 = $(cairo_boilerplate_pdf_headers)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_118 = $(cairo_boilerplate_pdf_private)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_119 = $(cairo_boilerplate_pdf_cxx_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_120 = $(cairo_boilerplate_pdf_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_121 = $(cairo_boilerplate_svg_headers)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_122 = $(cairo_boilerplate_svg_private)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_123 = $(cairo_boilerplate_svg_cxx_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_124 = $(cairo_boilerplate_svg_sources)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_125 = $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_126 = $(cairo_boilerplate_test_surfaces_cxx_sources)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_127 = $(cairo_boilerplate_test_surfaces_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_128 = $(cairo_boilerplate_tee_headers)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_129 = $(cairo_boilerplate_tee_private)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_130 = $(cairo_boilerplate_tee_cxx_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_131 = $(cairo_boilerplate_tee_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_132 = $(cairo_boilerplate_xml_headers)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_133 = $(cairo_boilerplate_xml_private)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_134 = $(cairo_boilerplate_xml_cxx_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_135 = $(cairo_boilerplate_xml_sources)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_136 = $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_137 = $(cairo_boilerplate_pthread_cxx_sources)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_138 = $(cairo_boilerplate_pthread_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_139 = $(cairo_boilerplate_gobject_headers)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_140 = $(cairo_boilerplate_gobject_private)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_141 = $(cairo_boilerplate_gobject_cxx_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_142 = $(cairo_boilerplate_gobject_sources)
--@CAIRO_HAS_TRACE_TRUE@am__append_143 = $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
--@CAIRO_HAS_TRACE_TRUE@am__append_144 = $(cairo_boilerplate_trace_cxx_sources)
--@CAIRO_HAS_TRACE_TRUE@am__append_145 = $(cairo_boilerplate_trace_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_146 = $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_147 = $(cairo_boilerplate_interpreter_cxx_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_148 = $(cairo_boilerplate_interpreter_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_149 = $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_150 = $(cairo_boilerplate_symbol_lookup_cxx_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_151 = $(cairo_boilerplate_symbol_lookup_sources)
--@CAIRO_HAS_DL_TRUE@am__append_152 = -ldl
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_153 = -lwinspool
--@CROSS_COMPILING_FALSE@am__append_154 = check-link$(EXEEXT)
-+@CAIRO_HAS_DL_TRUE@am__append_1 = -ldl
-+@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_2 = -lwinspool
-+@CROSS_COMPILING_FALSE@am__append_3 = check-link$(EXEEXT)
- subdir = boilerplate
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -235,100 +75,7 @@
- CONFIG_CLEAN_VPATH_FILES =
- @BUILD_CXX_TRUE@am__DEPENDENCIES_1 = libcairoboilerplate_cxx.la
- am__DEPENDENCIES_2 =
--am__libcairoboilerplate_la_SOURCES_DIST = cairo-boilerplate-getopt.h \
--	cairo-boilerplate-scaled-font.h cairo-boilerplate-system.h \
--	cairo-boilerplate.h cairo-boilerplate-xlib.h \
--	cairo-boilerplate-private.h cairo-boilerplate-getopt.c \
--	cairo-boilerplate-system.c cairo-boilerplate.c \
--	cairo-boilerplate-xlib.c cairo-boilerplate-xcb.c \
--	cairo-boilerplate-quartz.c cairo-boilerplate-win32.c \
--	cairo-boilerplate-win32-printing.c cairo-boilerplate-skia.c \
--	cairo-boilerplate-drm.c cairo-boilerplate-directfb.c \
--	cairo-boilerplate-vg.c cairo-boilerplate-egl.c \
--	cairo-boilerplate-glx.c cairo-boilerplate-wgl.c \
--	cairo-boilerplate-script.c cairo-boilerplate-ps.c \
--	cairo-boilerplate-pdf.c cairo-boilerplate-svg.c \
--	cairo-boilerplate-test-surfaces.c \
--	cairo-boilerplate-constructors.c
--am__objects_1 =
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_2 = $(am__objects_1)
--am__objects_3 = $(am__objects_1) $(am__objects_2) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1)
--am__objects_4 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1)
--am__objects_5 = cairo-boilerplate-getopt.lo \
--	cairo-boilerplate-system.lo cairo-boilerplate.lo
--am__objects_6 = cairo-boilerplate-xlib.lo
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_7 = $(am__objects_6)
--am__objects_8 = cairo-boilerplate-xcb.lo
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_9 = $(am__objects_8)
--am__objects_10 = cairo-boilerplate-quartz.lo
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_11 = $(am__objects_10)
--am__objects_12 = cairo-boilerplate-win32.lo \
--	cairo-boilerplate-win32-printing.lo
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_13 = $(am__objects_12)
--am__objects_14 = cairo-boilerplate-skia.lo
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__objects_15 = $(am__objects_14)
--am__objects_16 = cairo-boilerplate-drm.lo
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__objects_17 = $(am__objects_16)
--am__objects_18 = cairo-boilerplate-directfb.lo
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__objects_19 = $(am__objects_18)
--am__objects_20 = cairo-boilerplate-vg.lo
--@CAIRO_HAS_VG_SURFACE_TRUE@am__objects_21 = $(am__objects_20)
--am__objects_22 = cairo-boilerplate-egl.lo
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__objects_23 = $(am__objects_22)
--am__objects_24 = cairo-boilerplate-glx.lo
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__objects_25 = $(am__objects_24)
--am__objects_26 = cairo-boilerplate-wgl.lo
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__objects_27 = $(am__objects_26)
--am__objects_28 = cairo-boilerplate-script.lo
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_29 = $(am__objects_28)
--am__objects_30 = cairo-boilerplate-ps.lo
--@CAIRO_HAS_PS_SURFACE_TRUE@am__objects_31 = $(am__objects_30)
--am__objects_32 = cairo-boilerplate-pdf.lo
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_33 = $(am__objects_32)
--am__objects_34 = cairo-boilerplate-svg.lo
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_35 = $(am__objects_34)
--am__objects_36 = cairo-boilerplate-test-surfaces.lo
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_37 = $(am__objects_36)
--am__objects_38 = $(am__objects_5) $(am__objects_7) $(am__objects_1) \
--	$(am__objects_9) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_11) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_13) $(am__objects_1) \
--	$(am__objects_15) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_17) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_19) $(am__objects_21) $(am__objects_23) \
--	$(am__objects_25) $(am__objects_27) $(am__objects_29) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_31) \
--	$(am__objects_33) $(am__objects_35) $(am__objects_37) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1)
--am_libcairoboilerplate_la_OBJECTS = $(am__objects_3) $(am__objects_4) \
--	$(am__objects_38) cairo-boilerplate-constructors.lo
-+am_libcairoboilerplate_la_OBJECTS = cairo-boilerplate-constructors.lo
- libcairoboilerplate_la_OBJECTS = $(am_libcairoboilerplate_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -336,32 +83,9 @@
- libcairoboilerplate_cxx_la_DEPENDENCIES =  \
- 	$(top_builddir)/src/libcairo.la $(am__DEPENDENCIES_2) \
- 	$(am__DEPENDENCIES_2)
--am__libcairoboilerplate_cxx_la_SOURCES_DIST =  \
--	cairo-boilerplate-qt.cpp cairo-boilerplate-beos.cpp
--am__objects_39 = libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo
--@CAIRO_HAS_QT_SURFACE_TRUE@am__objects_40 = $(am__objects_39)
--am__objects_41 = libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__objects_42 = $(am__objects_41)
--am__objects_43 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_40) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_42) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1)
--am_libcairoboilerplate_cxx_la_OBJECTS = $(am__objects_43)
-+am_libcairoboilerplate_cxx_la_OBJECTS =
- libcairoboilerplate_cxx_la_OBJECTS =  \
- 	$(am_libcairoboilerplate_cxx_la_OBJECTS)
--libcairoboilerplate_cxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
--	$(libcairoboilerplate_cxx_la_CXXFLAGS) $(CXXFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- @BUILD_CXX_TRUE@am_libcairoboilerplate_cxx_la_rpath =
- check_link_SOURCES = check-link.c
- check_link_OBJECTS = check-link.$(OBJEXT)
-@@ -389,29 +113,13 @@
- AM_V_CCLD = $(am__v_CCLD_$(V))
- am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
- am__v_CCLD_0 = @echo "  CCLD  " $@;
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
--AM_V_CXX = $(am__v_CXX_$(V))
--am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
--am__v_CXX_0 = @echo "  CXX   " $@;
--CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--AM_V_CXXLD = $(am__v_CXXLD_$(V))
--am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
--am__v_CXXLD_0 = @echo "  CXXLD " $@;
- AM_V_GEN = $(am__v_GEN_$(V))
- am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
- am__v_GEN_0 = @echo "  GEN   " $@;
- SOURCES = $(libcairoboilerplate_la_SOURCES) \
- 	$(libcairoboilerplate_cxx_la_SOURCES) check-link.c
--DIST_SOURCES = $(am__libcairoboilerplate_la_SOURCES_DIST) \
--	$(am__libcairoboilerplate_cxx_la_SOURCES_DIST) check-link.c
-+DIST_SOURCES = $(libcairoboilerplate_la_SOURCES) \
-+	$(libcairoboilerplate_cxx_la_SOURCES) check-link.c
- ETAGS = etags
- CTAGS = ctags
- am__tty_colors = \
-@@ -496,6 +204,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -585,6 +294,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -634,320 +344,7 @@
- 	make-cairo-boilerplate-constructors.sh
- EXTRA_LTLIBRARIES = libcairoboilerplate.la $(cxx_boilerplate_lib)
- MAINTAINERCLEANFILES = Makefile.in
--TESTS = $(am__append_154)
--cairo_boilerplate_headers = \
--	cairo-boilerplate-getopt.h \
--	cairo-boilerplate-scaled-font.h \
--	cairo-boilerplate-system.h \
--	cairo-boilerplate.h \
--	$(NULL)
--
--cairo_boilerplate_sources = \
--	cairo-boilerplate-getopt.c \
--	cairo-boilerplate-system.c \
--	cairo-boilerplate.c \
--	$(NULL)
--
--cairo_boilerplate_private = \
--	cairo-boilerplate-private.h \
--	$(NULL)
--
--cairo_boilerplate_beos_cxx_sources = cairo-boilerplate-beos.cpp
--cairo_boilerplate_directfb_sources = cairo-boilerplate-directfb.c
--cairo_boilerplate_drm_sources = cairo-boilerplate-drm.c
--cairo_boilerplate_glx_sources = cairo-boilerplate-glx.c
--cairo_boilerplate_wgl_sources = cairo-boilerplate-wgl.c
--cairo_boilerplate_egl_sources = cairo-boilerplate-egl.c
--cairo_boilerplate_pdf_sources = cairo-boilerplate-pdf.c
--cairo_boilerplate_ps_sources = cairo-boilerplate-ps.c
--cairo_boilerplate_qt_cxx_sources = cairo-boilerplate-qt.cpp
--cairo_boilerplate_quartz_sources = cairo-boilerplate-quartz.c
--cairo_boilerplate_script_sources = cairo-boilerplate-script.c
--cairo_boilerplate_skia_sources = cairo-boilerplate-skia.c
--cairo_boilerplate_svg_sources = cairo-boilerplate-svg.c
--cairo_boilerplate_test_surfaces_sources = cairo-boilerplate-test-surfaces.c
--cairo_boilerplate_win32_sources = cairo-boilerplate-win32.c cairo-boilerplate-win32-printing.c
--cairo_boilerplate_xcb_sources = cairo-boilerplate-xcb.c
--cairo_boilerplate_xlib_headers = cairo-boilerplate-xlib.h
--cairo_boilerplate_xlib_sources = cairo-boilerplate-xlib.c
--cairo_boilerplate_vg_sources = cairo-boilerplate-vg.c
--supported_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \
--	$(cairo_boilerplate_xlib_headers) \
--	$(cairo_boilerplate_xlib_xrender_headers) \
--	$(cairo_boilerplate_xcb_shm_headers) \
--	$(cairo_boilerplate_quartz_headers) \
--	$(cairo_boilerplate_quartz_font_headers) \
--	$(cairo_boilerplate_win32_headers) \
--	$(cairo_boilerplate_win32_font_headers) \
--	$(cairo_boilerplate_png_headers) \
--	$(cairo_boilerplate_egl_headers) \
--	$(cairo_boilerplate_glx_headers) \
--	$(cairo_boilerplate_wgl_headers) \
--	$(cairo_boilerplate_ft_headers) \
--	$(cairo_boilerplate_fc_headers) \
--	$(cairo_boilerplate_ps_headers) \
--	$(cairo_boilerplate_pdf_headers) \
--	$(cairo_boilerplate_svg_headers) \
--	$(cairo_boilerplate_image_headers) \
--	$(cairo_boilerplate_recording_headers) \
--	$(cairo_boilerplate_user_headers) \
--	$(cairo_boilerplate_gobject_headers)
--unsupported_cairo_boilerplate_headers =  \
--	$(cairo_boilerplate_xcb_headers) \
--	$(cairo_boilerplate_xlib_xcb_headers) \
--	$(cairo_boilerplate_qt_headers) \
--	$(cairo_boilerplate_quartz_image_headers) \
--	$(cairo_boilerplate_skia_headers) \
--	$(cairo_boilerplate_os2_headers) \
--	$(cairo_boilerplate_beos_headers) \
--	$(cairo_boilerplate_drm_headers) \
--	$(cairo_boilerplate_drm_xr_headers) \
--	$(cairo_boilerplate_gallium_headers) \
--	$(cairo_boilerplate_xcb_drm_headers) \
--	$(cairo_boilerplate_gl_headers) \
--	$(cairo_boilerplate_directfb_headers) \
--	$(cairo_boilerplate_vg_headers) \
--	$(cairo_boilerplate_script_headers) \
--	$(cairo_boilerplate_tee_headers) \
--	$(cairo_boilerplate_xml_headers)
--all_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \
--	$(cairo_boilerplate_xlib_headers) \
--	$(cairo_boilerplate_xlib_xrender_headers) \
--	$(cairo_boilerplate_xcb_headers) \
--	$(cairo_boilerplate_xlib_xcb_headers) \
--	$(cairo_boilerplate_xcb_shm_headers) \
--	$(cairo_boilerplate_qt_headers) \
--	$(cairo_boilerplate_quartz_headers) \
--	$(cairo_boilerplate_quartz_font_headers) \
--	$(cairo_boilerplate_quartz_image_headers) \
--	$(cairo_boilerplate_win32_headers) \
--	$(cairo_boilerplate_win32_font_headers) \
--	$(cairo_boilerplate_skia_headers) \
--	$(cairo_boilerplate_os2_headers) \
--	$(cairo_boilerplate_beos_headers) \
--	$(cairo_boilerplate_drm_headers) \
--	$(cairo_boilerplate_drm_xr_headers) \
--	$(cairo_boilerplate_gallium_headers) \
--	$(cairo_boilerplate_xcb_drm_headers) \
--	$(cairo_boilerplate_png_headers) \
--	$(cairo_boilerplate_gl_headers) \
--	$(cairo_boilerplate_directfb_headers) \
--	$(cairo_boilerplate_vg_headers) \
--	$(cairo_boilerplate_egl_headers) \
--	$(cairo_boilerplate_glx_headers) \
--	$(cairo_boilerplate_wgl_headers) \
--	$(cairo_boilerplate_script_headers) \
--	$(cairo_boilerplate_ft_headers) \
--	$(cairo_boilerplate_fc_headers) \
--	$(cairo_boilerplate_ps_headers) \
--	$(cairo_boilerplate_pdf_headers) \
--	$(cairo_boilerplate_svg_headers) \
--	$(cairo_boilerplate_image_headers) \
--	$(cairo_boilerplate_recording_headers) \
--	$(cairo_boilerplate_tee_headers) \
--	$(cairo_boilerplate_xml_headers) \
--	$(cairo_boilerplate_user_headers) \
--	$(cairo_boilerplate_gobject_headers)
--all_cairo_boilerplate_private = $(cairo_boilerplate_private) \
--	$(cairo_boilerplate_xlib_private) \
--	$(cairo_boilerplate_xlib_xrender_private) \
--	$(cairo_boilerplate_xcb_private) \
--	$(cairo_boilerplate_xlib_xcb_private) \
--	$(cairo_boilerplate_xcb_shm_private) \
--	$(cairo_boilerplate_qt_private) \
--	$(cairo_boilerplate_quartz_private) \
--	$(cairo_boilerplate_quartz_font_private) \
--	$(cairo_boilerplate_quartz_image_private) \
--	$(cairo_boilerplate_win32_private) \
--	$(cairo_boilerplate_win32_font_private) \
--	$(cairo_boilerplate_skia_private) \
--	$(cairo_boilerplate_os2_private) \
--	$(cairo_boilerplate_beos_private) \
--	$(cairo_boilerplate_drm_private) \
--	$(cairo_boilerplate_drm_xr_private) \
--	$(cairo_boilerplate_gallium_private) \
--	$(cairo_boilerplate_xcb_drm_private) \
--	$(cairo_boilerplate_png_private) \
--	$(cairo_boilerplate_gl_private) \
--	$(cairo_boilerplate_directfb_private) \
--	$(cairo_boilerplate_vg_private) \
--	$(cairo_boilerplate_egl_private) \
--	$(cairo_boilerplate_glx_private) \
--	$(cairo_boilerplate_wgl_private) \
--	$(cairo_boilerplate_script_private) \
--	$(cairo_boilerplate_ft_private) \
--	$(cairo_boilerplate_fc_private) \
--	$(cairo_boilerplate_ps_private) \
--	$(cairo_boilerplate_pdf_private) \
--	$(cairo_boilerplate_svg_private) \
--	$(cairo_boilerplate_test_surfaces_private) \
--	$(cairo_boilerplate_test_surfaces_headers) \
--	$(cairo_boilerplate_image_private) \
--	$(cairo_boilerplate_recording_private) \
--	$(cairo_boilerplate_tee_private) \
--	$(cairo_boilerplate_xml_private) \
--	$(cairo_boilerplate_user_private) \
--	$(cairo_boilerplate_pthread_private) \
--	$(cairo_boilerplate_pthread_headers) \
--	$(cairo_boilerplate_gobject_private) \
--	$(cairo_boilerplate_trace_private) \
--	$(cairo_boilerplate_trace_headers) \
--	$(cairo_boilerplate_interpreter_private) \
--	$(cairo_boilerplate_interpreter_headers) \
--	$(cairo_boilerplate_symbol_lookup_private) \
--	$(cairo_boilerplate_symbol_lookup_headers)
--all_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources) \
--	$(cairo_boilerplate_xlib_cxx_sources) \
--	$(cairo_boilerplate_xlib_xrender_cxx_sources) \
--	$(cairo_boilerplate_xcb_cxx_sources) \
--	$(cairo_boilerplate_xlib_xcb_cxx_sources) \
--	$(cairo_boilerplate_xcb_shm_cxx_sources) \
--	$(cairo_boilerplate_qt_cxx_sources) \
--	$(cairo_boilerplate_quartz_cxx_sources) \
--	$(cairo_boilerplate_quartz_font_cxx_sources) \
--	$(cairo_boilerplate_quartz_image_cxx_sources) \
--	$(cairo_boilerplate_win32_cxx_sources) \
--	$(cairo_boilerplate_win32_font_cxx_sources) \
--	$(cairo_boilerplate_skia_cxx_sources) \
--	$(cairo_boilerplate_os2_cxx_sources) \
--	$(cairo_boilerplate_beos_cxx_sources) \
--	$(cairo_boilerplate_drm_cxx_sources) \
--	$(cairo_boilerplate_drm_xr_cxx_sources) \
--	$(cairo_boilerplate_gallium_cxx_sources) \
--	$(cairo_boilerplate_xcb_drm_cxx_sources) \
--	$(cairo_boilerplate_png_cxx_sources) \
--	$(cairo_boilerplate_gl_cxx_sources) \
--	$(cairo_boilerplate_directfb_cxx_sources) \
--	$(cairo_boilerplate_vg_cxx_sources) \
--	$(cairo_boilerplate_egl_cxx_sources) \
--	$(cairo_boilerplate_glx_cxx_sources) \
--	$(cairo_boilerplate_wgl_cxx_sources) \
--	$(cairo_boilerplate_script_cxx_sources) \
--	$(cairo_boilerplate_ft_cxx_sources) \
--	$(cairo_boilerplate_fc_cxx_sources) \
--	$(cairo_boilerplate_ps_cxx_sources) \
--	$(cairo_boilerplate_pdf_cxx_sources) \
--	$(cairo_boilerplate_svg_cxx_sources) \
--	$(cairo_boilerplate_test_surfaces_cxx_sources) \
--	$(cairo_boilerplate_image_cxx_sources) \
--	$(cairo_boilerplate_recording_cxx_sources) \
--	$(cairo_boilerplate_tee_cxx_sources) \
--	$(cairo_boilerplate_xml_cxx_sources) \
--	$(cairo_boilerplate_user_cxx_sources) \
--	$(cairo_boilerplate_pthread_cxx_sources) \
--	$(cairo_boilerplate_gobject_cxx_sources) \
--	$(cairo_boilerplate_trace_cxx_sources) \
--	$(cairo_boilerplate_interpreter_cxx_sources) \
--	$(cairo_boilerplate_symbol_lookup_cxx_sources)
--all_cairo_boilerplate_sources = $(cairo_boilerplate_sources) \
--	$(cairo_boilerplate_xlib_sources) \
--	$(cairo_boilerplate_xlib_xrender_sources) \
--	$(cairo_boilerplate_xcb_sources) \
--	$(cairo_boilerplate_xlib_xcb_sources) \
--	$(cairo_boilerplate_xcb_shm_sources) \
--	$(cairo_boilerplate_qt_sources) \
--	$(cairo_boilerplate_quartz_sources) \
--	$(cairo_boilerplate_quartz_font_sources) \
--	$(cairo_boilerplate_quartz_image_sources) \
--	$(cairo_boilerplate_win32_sources) \
--	$(cairo_boilerplate_win32_font_sources) \
--	$(cairo_boilerplate_skia_sources) \
--	$(cairo_boilerplate_os2_sources) \
--	$(cairo_boilerplate_beos_sources) \
--	$(cairo_boilerplate_drm_sources) \
--	$(cairo_boilerplate_drm_xr_sources) \
--	$(cairo_boilerplate_gallium_sources) \
--	$(cairo_boilerplate_xcb_drm_sources) \
--	$(cairo_boilerplate_png_sources) \
--	$(cairo_boilerplate_gl_sources) \
--	$(cairo_boilerplate_directfb_sources) \
--	$(cairo_boilerplate_vg_sources) \
--	$(cairo_boilerplate_egl_sources) \
--	$(cairo_boilerplate_glx_sources) \
--	$(cairo_boilerplate_wgl_sources) \
--	$(cairo_boilerplate_script_sources) \
--	$(cairo_boilerplate_ft_sources) \
--	$(cairo_boilerplate_fc_sources) \
--	$(cairo_boilerplate_ps_sources) \
--	$(cairo_boilerplate_pdf_sources) \
--	$(cairo_boilerplate_svg_sources) \
--	$(cairo_boilerplate_test_surfaces_sources) \
--	$(cairo_boilerplate_image_sources) \
--	$(cairo_boilerplate_recording_sources) \
--	$(cairo_boilerplate_tee_sources) \
--	$(cairo_boilerplate_xml_sources) \
--	$(cairo_boilerplate_user_sources) \
--	$(cairo_boilerplate_pthread_sources) \
--	$(cairo_boilerplate_gobject_sources) \
--	$(cairo_boilerplate_trace_sources) \
--	$(cairo_boilerplate_interpreter_sources) \
--	$(cairo_boilerplate_symbol_lookup_sources)
--enabled_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \
--	$(am__append_1) $(am__append_5) $(am__append_9) \
--	$(am__append_13) $(am__append_17) $(am__append_21) \
--	$(am__append_25) $(am__append_29) $(am__append_33) \
--	$(am__append_37) $(am__append_41) $(am__append_45) \
--	$(am__append_49) $(am__append_53) $(am__append_57) \
--	$(am__append_61) $(am__append_65) $(am__append_69) \
--	$(am__append_73) $(am__append_77) $(am__append_81) \
--	$(am__append_85) $(am__append_89) $(am__append_93) \
--	$(am__append_97) $(am__append_101) $(am__append_105) \
--	$(am__append_109) $(am__append_113) $(am__append_117) \
--	$(am__append_121) $(cairo_boilerplate_image_headers) \
--	$(cairo_boilerplate_recording_headers) $(am__append_128) \
--	$(am__append_132) $(cairo_boilerplate_user_headers) \
--	$(am__append_139)
--enabled_cairo_boilerplate_private = $(cairo_boilerplate_private) \
--	$(am__append_2) $(am__append_6) $(am__append_10) \
--	$(am__append_14) $(am__append_18) $(am__append_22) \
--	$(am__append_26) $(am__append_30) $(am__append_34) \
--	$(am__append_38) $(am__append_42) $(am__append_46) \
--	$(am__append_50) $(am__append_54) $(am__append_58) \
--	$(am__append_62) $(am__append_66) $(am__append_70) \
--	$(am__append_74) $(am__append_78) $(am__append_82) \
--	$(am__append_86) $(am__append_90) $(am__append_94) \
--	$(am__append_98) $(am__append_102) $(am__append_106) \
--	$(am__append_110) $(am__append_114) $(am__append_118) \
--	$(am__append_122) $(am__append_125) \
--	$(cairo_boilerplate_image_private) \
--	$(cairo_boilerplate_recording_private) $(am__append_129) \
--	$(am__append_133) $(cairo_boilerplate_user_private) \
--	$(am__append_136) $(am__append_140) $(am__append_143) \
--	$(am__append_146) $(am__append_149)
--enabled_cairo_boilerplate_cxx_sources =  \
--	$(cairo_boilerplate_cxx_sources) $(am__append_3) \
--	$(am__append_7) $(am__append_11) $(am__append_15) \
--	$(am__append_19) $(am__append_23) $(am__append_27) \
--	$(am__append_31) $(am__append_35) $(am__append_39) \
--	$(am__append_43) $(am__append_47) $(am__append_51) \
--	$(am__append_55) $(am__append_59) $(am__append_63) \
--	$(am__append_67) $(am__append_71) $(am__append_75) \
--	$(am__append_79) $(am__append_83) $(am__append_87) \
--	$(am__append_91) $(am__append_95) $(am__append_99) \
--	$(am__append_103) $(am__append_107) $(am__append_111) \
--	$(am__append_115) $(am__append_119) $(am__append_123) \
--	$(am__append_126) $(cairo_boilerplate_image_cxx_sources) \
--	$(cairo_boilerplate_recording_cxx_sources) $(am__append_130) \
--	$(am__append_134) $(cairo_boilerplate_user_cxx_sources) \
--	$(am__append_137) $(am__append_141) $(am__append_144) \
--	$(am__append_147) $(am__append_150)
--enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources) \
--	$(am__append_4) $(am__append_8) $(am__append_12) \
--	$(am__append_16) $(am__append_20) $(am__append_24) \
--	$(am__append_28) $(am__append_32) $(am__append_36) \
--	$(am__append_40) $(am__append_44) $(am__append_48) \
--	$(am__append_52) $(am__append_56) $(am__append_60) \
--	$(am__append_64) $(am__append_68) $(am__append_72) \
--	$(am__append_76) $(am__append_80) $(am__append_84) \
--	$(am__append_88) $(am__append_92) $(am__append_96) \
--	$(am__append_100) $(am__append_104) $(am__append_108) \
--	$(am__append_112) $(am__append_116) $(am__append_120) \
--	$(am__append_124) $(am__append_127) \
--	$(cairo_boilerplate_image_sources) \
--	$(cairo_boilerplate_recording_sources) $(am__append_131) \
--	$(am__append_135) $(cairo_boilerplate_user_sources) \
--	$(am__append_138) $(am__append_142) $(am__append_145) \
--	$(am__append_148) $(am__append_151)
-+TESTS = $(am__append_3)
- #MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
- AM_CPPFLAGS = \
- 	-I$(srcdir) \
-@@ -972,7 +369,7 @@
- 
- libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la \
- 	$(cxx_boilerplate_lib) $(CAIRO_LIBS) $(CAIROBOILERPLATE_LIBS) \
--	$(NULL) $(am__append_152) $(am__append_153)
-+	$(NULL) $(am__append_1) $(am__append_2)
- libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \
- 	$(CAIRO_LIBS) \
- 	$(CAIROBOILERPLATE_LIBS) \
-@@ -990,8 +387,8 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
--.SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/Makefile.am.features $(top_srcdir)/boilerplate/Makefile.sources $(am__configure_deps)
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/Makefile.am.features $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -1016,15 +413,15 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- libcairoboilerplate.la: $(libcairoboilerplate_la_OBJECTS) $(libcairoboilerplate_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(LINK)  $(libcairoboilerplate_la_OBJECTS) $(libcairoboilerplate_la_LIBADD) $(LIBS)
- libcairoboilerplate_cxx.la: $(libcairoboilerplate_cxx_la_OBJECTS) $(libcairoboilerplate_cxx_la_DEPENDENCIES) 
--	$(AM_V_CXXLD)$(libcairoboilerplate_cxx_la_LINK) $(am_libcairoboilerplate_cxx_la_rpath) $(libcairoboilerplate_cxx_la_OBJECTS) $(libcairoboilerplate_cxx_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(LINK) $(am_libcairoboilerplate_cxx_la_rpath) $(libcairoboilerplate_cxx_la_OBJECTS) $(libcairoboilerplate_cxx_la_LIBADD) $(LIBS)
- 
- clean-checkPROGRAMS:
- 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-@@ -1045,29 +442,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-constructors.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-directfb.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-drm.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-egl.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-getopt.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-glx.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-pdf.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-ps.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-quartz.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-script.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-skia.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-svg.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-system.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-test-surfaces.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-vg.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-wgl.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-win32-printing.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-win32.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-xcb.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate-xlib.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boilerplate.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-link.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-beos.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-qt.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1093,46 +468,6 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
--.cpp.o:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
--
--.cpp.obj:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
--
--.cpp.lo:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
--
--libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo: cairo-boilerplate-qt.cpp
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairoboilerplate_cxx_la_CXXFLAGS) $(CXXFLAGS) -MT libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo -MD -MP -MF $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-qt.Tpo -c -o libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo `test -f 'cairo-boilerplate-qt.cpp' || echo '$(srcdir)/'`cairo-boilerplate-qt.cpp
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-qt.Tpo $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-qt.Plo
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cairo-boilerplate-qt.cpp' object='libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairoboilerplate_cxx_la_CXXFLAGS) $(CXXFLAGS) -c -o libcairoboilerplate_cxx_la-cairo-boilerplate-qt.lo `test -f 'cairo-boilerplate-qt.cpp' || echo '$(srcdir)/'`cairo-boilerplate-qt.cpp
--
--libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo: cairo-boilerplate-beos.cpp
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairoboilerplate_cxx_la_CXXFLAGS) $(CXXFLAGS) -MT libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo -MD -MP -MF $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-beos.Tpo -c -o libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo `test -f 'cairo-boilerplate-beos.cpp' || echo '$(srcdir)/'`cairo-boilerplate-beos.cpp
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-beos.Tpo $(DEPDIR)/libcairoboilerplate_cxx_la-cairo-boilerplate-beos.Plo
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cairo-boilerplate-beos.cpp' object='libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairoboilerplate_cxx_la_CXXFLAGS) $(CXXFLAGS) -c -o libcairoboilerplate_cxx_la-cairo-boilerplate-beos.lo `test -f 'cairo-boilerplate-beos.cpp' || echo '$(srcdir)/'`cairo-boilerplate-beos.cpp
--
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-Index: cairo/build/libtool.m4
-===================================================================
---- cairo.orig/build/libtool.m4	2010-09-06 23:50:27.215406925 +0200
-+++ cairo/build/libtool.m4	2010-09-06 23:49:58.811409419 +0200
-@@ -1,8 +1,7 @@
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- # This file is free software; the Free Software Foundation gives
-@@ -11,8 +10,7 @@
- 
- m4_define([_LT_COPYING], [dnl
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -39,7 +37,7 @@
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ])
- 
--# serial 57 LT_INIT
-+# serial 56 LT_INIT
- 
- 
- # LT_PREREQ(VERSION)
-@@ -68,7 +66,6 @@
- # ------------------
- AC_DEFUN([LT_INIT],
- [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
--AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- AC_BEFORE([$0], [LT_LANG])dnl
- AC_BEFORE([$0], [LT_OUTPUT])dnl
- AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -85,8 +82,6 @@
- AC_REQUIRE([LTOBSOLETE_VERSION])dnl
- m4_require([_LT_PROG_LTMAIN])dnl
- 
--_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
--
- dnl Parse OPTIONS
- _LT_SET_OPTIONS([$0], [$1])
- 
-@@ -123,7 +118,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
- 
- 
-@@ -143,9 +138,6 @@
- m4_defun([_LT_SETUP],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
--AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
--
- _LT_DECL([], [host_alias], [0], [The host system])dnl
- _LT_DECL([], [host], [0])dnl
- _LT_DECL([], [host_os], [0])dnl
-@@ -187,6 +179,7 @@
- _LT_CHECK_OBJDIR
- 
- m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
- 
- case $host_os in
- aix3*)
-@@ -200,6 +193,23 @@
-   ;;
- esac
- 
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
- # Global variables:
- ofile=libtool
- can_build_shared=yes
-@@ -240,28 +250,6 @@
- ])# _LT_SETUP
- 
- 
--# _LT_PREPARE_SED_QUOTE_VARS
--# --------------------------
--# Define a few sed substitution that help us do robust quoting.
--m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
--[# Backslashify metacharacters that are still active within
--# double-quoted strings.
--sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--])
--
- # _LT_PROG_LTMAIN
- # ---------------
- # Note that this code is called both from `configure', and `config.status'
-@@ -420,7 +408,7 @@
- # declaration there will have the same value as in `configure'.  VARNAME
- # must have a single quote delimited value for this to work.
- m4_define([_LT_CONFIG_STATUS_DECLARE],
--[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
- 
- 
- # _LT_CONFIG_STATUS_DECLARATIONS
-@@ -430,7 +418,7 @@
- # embedded single quotes properly.  In configure, this macro expands
- # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
- #
--#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
- m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
- [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -529,20 +517,12 @@
- LTCFLAGS='$LTCFLAGS'
- compiler='$compiler_DEFAULT'
- 
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--\$[]1
--_LTECHO_EOF'
--}
--
- # Quote evaled strings.
- for var in lt_decl_all_varnames([[ \
- ]], lt_decl_quote_varnames); do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-     *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -553,9 +533,9 @@
- # Double-quote double-evaled strings.
- for var in lt_decl_all_varnames([[ \
- ]], lt_decl_dquote_varnames); do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-     *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -563,38 +543,16 @@
-     esac
- done
- 
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\[$]0 --fallback-echo"')dnl "
-+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-+  ;;
-+esac
-+
- _LT_OUTPUT_LIBTOOL_INIT
- ])
- 
--# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
--# ------------------------------------
--# Generate a child script FILE with all initialization necessary to
--# reuse the environment learned by the parent script, and make the
--# file executable.  If COMMENT is supplied, it is inserted after the
--# `#!' sequence but before initialization text begins.  After this
--# macro, additional text can be appended to FILE to form the body of
--# the child script.  The macro ends with non-zero status if the
--# file could not be fully written (such as if the disk is full).
--m4_ifdef([AS_INIT_GENERATED],
--[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
--[m4_defun([_LT_GENERATED_FILE_INIT],
--[m4_require([AS_PREPARE])]dnl
--[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
--[lt_write_fail=0
--cat >$1 <<_ASEOF || lt_write_fail=1
--#! $SHELL
--# Generated by $as_me.
--$2
--SHELL=\${CONFIG_SHELL-$SHELL}
--export SHELL
--_ASEOF
--cat >>$1 <<\_ASEOF || lt_write_fail=1
--AS_SHELL_SANITIZE
--_AS_PREPARE
--exec AS_MESSAGE_FD>&1
--_ASEOF
--test $lt_write_fail = 0 && chmod +x $1[]dnl
--m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
- 
- # LT_OUTPUT
- # ---------
-@@ -604,11 +562,20 @@
- AC_DEFUN([LT_OUTPUT],
- [: ${CONFIG_LT=./config.lt}
- AC_MSG_NOTICE([creating $CONFIG_LT])
--_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
--[# Run this file to recreate a libtool stub with the current configuration.])
-+cat >"$CONFIG_LT" <<_LTEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate a libtool stub with the current configuration.
- 
--cat >>"$CONFIG_LT" <<\_LTEOF
- lt_cl_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
-+
-+exec AS_MESSAGE_FD>&1
- exec AS_MESSAGE_LOG_FD>>config.log
- {
-   echo
-@@ -634,7 +601,7 @@
- m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
- configured by $[0], generated by m4_PACKAGE_STRING.
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2008 Free Software Foundation, Inc.
- This config.lt script is free software; the Free Software Foundation
- gives unlimited permision to copy, distribute and modify it."
- 
-@@ -679,13 +646,15 @@
- # appending to config.log, which fails on DOS, as config.log is still kept
- # open by configure.  Here we exec the FD to /dev/null, effectively closing
- # config.log, so it can be properly (re)opened and appended to by config.lt.
--lt_cl_success=:
--test "$silent" = yes &&
--  lt_config_lt_args="$lt_config_lt_args --quiet"
--exec AS_MESSAGE_LOG_FD>/dev/null
--$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
--exec AS_MESSAGE_LOG_FD>>config.log
--$lt_cl_success || AS_EXIT(1)
-+if test "$no_create" != yes; then
-+  lt_cl_success=:
-+  test "$silent" = yes &&
-+    lt_config_lt_args="$lt_config_lt_args --quiet"
-+  exec AS_MESSAGE_LOG_FD>/dev/null
-+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+  exec AS_MESSAGE_LOG_FD>>config.log
-+  $lt_cl_success || AS_EXIT(1)
-+fi
- ])# LT_OUTPUT
- 
- 
-@@ -862,13 +831,11 @@
- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
--AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
- dnl aclocal-1.4 backwards compatibility:
- dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
- dnl AC_DEFUN([AC_LIBTOOL_F77], [])
- dnl AC_DEFUN([AC_LIBTOOL_FC], [])
- dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
--dnl AC_DEFUN([AC_LIBTOOL_RC], [])
- 
- 
- # _LT_TAG_COMPILER
-@@ -973,31 +940,6 @@
- 	[lt_cv_ld_exported_symbols_list=no])
- 	LDFLAGS="$save_LDFLAGS"
-     ])
--    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
--      [lt_cv_ld_force_load=no
--      cat > conftest.c << _LT_EOF
--int forced_loaded() { return 2;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
--      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
--      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
--      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
--      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
--      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
--      cat > conftest.c << _LT_EOF
--int main() { return 0;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
--      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
--      _lt_result=$?
--      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
--	lt_cv_ld_force_load=yes
--      else
--	cat conftest.err >&AS_MESSAGE_LOG_FD
--      fi
--        rm -f conftest.err libconftest.a conftest conftest.c
--        rm -rf conftest.dSYM
--    ])
-     case $host_os in
-     rhapsody* | darwin1.[[012]])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -1025,7 +967,7 @@
-     else
-       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
--    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+    if test "$DSYMUTIL" != ":"; then
-       _lt_dsymutil='~$DSYMUTIL $lib || :'
-     else
-       _lt_dsymutil=
-@@ -1045,11 +987,7 @@
-   _LT_TAGVAR(hardcode_direct, $1)=no
-   _LT_TAGVAR(hardcode_automatic, $1)=yes
-   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  if test "$lt_cv_ld_force_load" = "yes"; then
--    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
--  else
--    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
--  fi
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-   _LT_TAGVAR(link_all_deplibs, $1)=yes
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -1057,7 +995,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=func_echo_all
-+    output_verbose_link_cmd=echo
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1103,65 +1041,170 @@
- # _LT_SHELL_INIT(ARG)
- # -------------------
- m4_define([_LT_SHELL_INIT],
--[m4_divert_text([M4SH-INIT], [$1
--])])# _LT_SHELL_INIT
--
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_SHELL_INIT
- 
- 
- # _LT_PROG_ECHO_BACKSLASH
- # -----------------------
--# Find how we can fake an echo command that does not interpret backslash.
--# In particular, with Autoconf 2.60 or later we add some code to the start
--# of the generated configure script which will find a shell with a builtin
--# printf (which we can use as an echo command).
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
- m4_defun([_LT_PROG_ECHO_BACKSLASH],
--[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
--
--AC_MSG_CHECKING([how to print strings])
--# Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
--   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='print -r --'
--elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='printf %s\n'
-+[_LT_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$lt_ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+ECHO=${lt_ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-+  :
- else
--  # Use this function as a fallback that always works.
--  func_fallback_echo ()
--  {
--    eval 'cat <<_LTECHO_EOF
--$[]1
--_LTECHO_EOF'
--  }
--  ECHO='func_fallback_echo'
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
- fi
- 
--# func_echo_all arg...
--# Invoke $ECHO with all args, space-separated.
--func_echo_all ()
--{
--    $ECHO "$*" 
--}
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<_LT_EOF
-+[$]*
-+_LT_EOF
-+  exit 0
-+fi
- 
--case "$ECHO" in
--  printf*) AC_MSG_RESULT([printf]) ;;
--  print*) AC_MSG_RESULT([print -r]) ;;
--  *) AC_MSG_RESULT([cat]) ;;
--esac
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$lt_ECHO"; then
-+  if test "X${echo_test_string+set}" != Xset; then
-+    # find a string as large as possible, as long as the shell can cope with it
-+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-+      then
-+        break
-+      fi
-+    done
-+  fi
-+
-+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+     test "X$echo_testing_string" = "X$echo_test_string"; then
-+    :
-+  else
-+    # The Solaris, AIX, and Digital Unix default echo programs unquote
-+    # backslashes.  This makes it impossible to quote backslashes using
-+    #   echo "$something" | sed 's/\\/\\\\/g'
-+    #
-+    # So, first we look for a working echo in the user's PATH.
-+
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for dir in $PATH /usr/ucb; do
-+      IFS="$lt_save_ifs"
-+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        ECHO="$dir/echo"
-+        break
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+
-+    if test "X$ECHO" = Xecho; then
-+      # We didn't find a better echo, so look for alternatives.
-+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        # This shell has a builtin print -r that does the trick.
-+        ECHO='print -r'
-+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-+        # If we have ksh, try running configure again with it.
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        export ORIGINAL_CONFIG_SHELL
-+        CONFIG_SHELL=/bin/ksh
-+        export CONFIG_SHELL
-+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+      else
-+        # Try using printf.
-+        ECHO='printf %s\n'
-+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  # Cool, printf works
-+	  :
-+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	  export CONFIG_SHELL
-+	  SHELL="$CONFIG_SHELL"
-+	  export SHELL
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        else
-+	  # maybe with a smaller string...
-+	  prev=:
- 
--m4_ifdef([_AS_DETECT_SUGGESTED],
--[_AS_DETECT_SUGGESTED([
--  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
--    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
--    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
--    PATH=/empty FPATH=/empty; export PATH FPATH
--    test "X`printf %s $ECHO`" = "X$ECHO" \
--      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-+	    then
-+	      break
-+	    fi
-+	    prev="$cmd"
-+	  done
- 
-+	  if test "$prev" != 'sed 50q "[$]0"'; then
-+	    echo_test_string=`eval $prev`
-+	    export echo_test_string
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	  else
-+	    # Oops.  We lost completely, so just stick with echo.
-+	    ECHO=echo
-+	  fi
-+        fi
-+      fi
-+    fi
-+  fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(lt_ECHO)
-+])
- _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-+_LT_DECL([], [ECHO], [1],
-+    [An echo program that does not interpret backslashes])
- ])# _LT_PROG_ECHO_BACKSLASH
- 
- 
-@@ -1193,7 +1236,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
-       case `/usr/bin/file conftest.$ac_objext` in
-@@ -1345,19 +1388,10 @@
-   esac
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
--
--case $host_os in
--  darwin*)
--    lock_old_archive_extraction=yes ;;
--  *)
--    lock_old_archive_extraction=no ;;
--esac
- _LT_DECL([], [old_postinstall_cmds], [2])
- _LT_DECL([], [old_postuninstall_cmds], [2])
- _LT_TAGDECL([], [old_archive_cmds], [2],
-     [Commands used to build an old-style archive])
--_LT_DECL([], [lock_old_archive_extraction], [0],
--    [Whether to use a lock for old archive extraction])
- ])# _LT_CMD_OLD_ARCHIVE
- 
- 
-@@ -1382,15 +1416,15 @@
-    -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-@@ -1430,7 +1464,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
--       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          $2=yes
-@@ -1493,11 +1527,6 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  mint*)
--    # On MiNT this can take a long time and run out of memory.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -1562,8 +1591,8 @@
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
--      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
--	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test $i != 17 # 1/2 MB should be enough
-       do
-         i=`expr $i + 1`
-@@ -1614,7 +1643,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--[#line $LINENO "configure"
-+[#line __oline__ "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -1655,13 +1684,7 @@
- #  endif
- #endif
- 
--/* When -fvisbility=hidden is used, assume the code has been annotated
--   correspondingly for the symbols needed.  */
--#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
--#endif
--
--void fnord () { int i=42; }
-+void fnord() { int i=42;}
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1670,11 +1693,7 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else
--        {
--	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
--          else puts (dlerror ());
--	}
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-   else
-@@ -1850,16 +1869,16 @@
-    -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2018,7 +2037,6 @@
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_OBJDUMP])dnl
- m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_CHECK_SHELL_FEATURES])dnl
- AC_MSG_CHECKING([dynamic linker characteristics])
- m4_if([$1],
- 	[], [
-@@ -2027,23 +2045,16 @@
-     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-     *) lt_awk_arg="/^libraries:/" ;;
-   esac
--  case $host_os in
--    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
--    *) lt_sed_strip_eq="s,=/,/,g" ;;
--  esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
--  case $lt_search_path_spec in
--  *\;*)
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-     # if the path contains ";" then we assume it to be the separator
-     # otherwise default to the standard path separator (i.e. ":") - it is
-     # assumed that no part of a normal pathname contains ";" but that should
-     # okay in the real world where ";" in dirpaths is itself problematic.
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
--    ;;
--  *)
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
--    ;;
--  esac
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-   # Ok, now we have the path, separated by spaces, we can step through it
-   # and add multilib dir if necessary.
-   lt_tmp_lt_search_path_spec=
-@@ -2056,7 +2067,7 @@
- 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
-   done
--  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
- BEGIN {RS=" "; FS="/|\n";} {
-   lt_foo="";
-   lt_count=0;
-@@ -2076,13 +2087,7 @@
-   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
- }'`
--  # AWK program above erroneously prepends '/' to C:/dos/paths
--  # for these hosts.
--  case $host_os in
--    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
--      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
--  esac
--  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
- else
-   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi])
-@@ -2170,7 +2175,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -2223,12 +2228,23 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--m4_if([$1], [],[
--      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -2328,19 +2344,6 @@
-   hardcode_into_libs=yes
-   ;;
- 
--haiku*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  dynamic_linker="$host_os runtime_loader"
--  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=LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
--  hardcode_into_libs=yes
--  ;;
--
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -2383,10 +2386,8 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-   postinstall_cmds='chmod 555 $lib'
--  # or fails outright, so override atomically:
--  install_override_mode=555
-   ;;
- 
- interix[[3-9]]*)
-@@ -2453,35 +2454,26 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--
-   # Some binutils ld are patched to set DT_RUNPATH
--  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
--    [lt_cv_shlibpath_overrides_runpath=no
--    save_LDFLAGS=$LDFLAGS
--    save_libdir=$libdir
--    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
--	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
--      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
--	 [lt_cv_shlibpath_overrides_runpath=yes])])
--    LDFLAGS=$save_LDFLAGS
--    libdir=$save_libdir
--    ])
--  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+       [shlibpath_overrides_runpath=yes])])
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # 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;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2493,6 +2485,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -2713,8 +2717,6 @@
-     The last name is the one that the linker finds with -lNAME]])
- _LT_DECL([], [soname_spec], [1],
-     [[The coded name of the library, if different from the real name]])
--_LT_DECL([], [install_override_mode], [1],
--    [Permission mode override for installation of shared libraries])
- _LT_DECL([], [postinstall_cmds], [2],
-     [Command to use after installation of a shared archive])
- _LT_DECL([], [postuninstall_cmds], [2],
-@@ -2827,7 +2829,6 @@
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
- m4_require([_LT_DECL_SED])dnl
- m4_require([_LT_DECL_EGREP])dnl
--m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
- 
- AC_ARG_WITH([gnu-ld],
-     [AS_HELP_STRING([--with-gnu-ld],
-@@ -2957,8 +2958,8 @@
-     fi
-     ;;
- esac
--_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
--_LT_TAGDECL([], [reload_cmds], [2])dnl
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
- ])# _LT_CMD_RELOAD
- 
- 
-@@ -3010,18 +3011,16 @@
-   # Base MSYS/MinGW do not provide the 'file' command needed by
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
--  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
--  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+  if ( file / ) >/dev/null 2>&1; then
-     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
--    # Keep this pattern in sync with the one in func_win32_libid.
--    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-     lt_cv_file_magic_cmd='$OBJDUMP -f'
-   fi
-   ;;
- 
--cegcc*)
-+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'
-@@ -3051,10 +3050,6 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--haiku*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -3063,11 +3058,11 @@
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-     ;;
-   hppa*64*)
--    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
-   *)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-     lt_cv_file_magic_test_file=/usr/lib/libc.sl
-     ;;
-   esac
-@@ -3093,7 +3088,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3231,19 +3226,7 @@
-   NM="$lt_cv_path_NM"
- else
-   # Didn't find any BSD compatible name lister, look for dumpbin.
--  if test -n "$DUMPBIN"; then :
--    # Let the user override the test.
--  else
--    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
--    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
--    *COFF*)
--      DUMPBIN="$DUMPBIN -symbols"
--      ;;
--    *)
--      DUMPBIN=:
--      ;;
--    esac
--  fi
-+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-   AC_SUBST([DUMPBIN])
-   if test "$DUMPBIN" != ":"; then
-     NM="$DUMPBIN"
-@@ -3256,13 +3239,13 @@
- AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-   [lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-   cat conftest.out >&AS_MESSAGE_LOG_FD
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -3285,7 +3268,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
--*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3313,12 +3296,7 @@
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- 
- if test "$GCC" = yes; then
--  case $cc_basename in
--  nvcc*)
--    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
--  *)
--    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
--  esac
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- 
-   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-     lt_cv_prog_compiler_rtti_exceptions,
-@@ -3335,7 +3313,6 @@
- m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_AWK])dnl
- AC_REQUIRE([LT_PATH_NM])dnl
- AC_REQUIRE([LT_PATH_LD])dnl
- m4_require([_LT_DECL_SED])dnl
-@@ -3461,7 +3438,7 @@
-   if AC_TRY_EVAL(ac_compile); then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
- 	mv -f "$nlist"T "$nlist"
-@@ -3623,11 +3600,6 @@
-       # DJGPP does not support shared libraries at all
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-       ;;
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)=
--      ;;
-     interix[[3-9]]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -3766,8 +3738,8 @@
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    ;;
--	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
--	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
- 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -3797,7 +3769,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3829,7 +3801,7 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC* | sunCC*)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -3933,12 +3905,6 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-       ;;
- 
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)=
--      ;;
--
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3981,13 +3947,6 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-     esac
--
--    case $cc_basename in
--    nvcc*) # Cuda Compiler Driver 2.2
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
--      ;;
--    esac
-   else
-     # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
-@@ -4051,7 +4010,7 @@
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- 	;;
--      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4063,26 +4022,26 @@
-         # All Alpha code is PIC.
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-         ;;
--      xl* | bgxl* | bgf* | mpixl*)
--	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- 	;;
-       *)
- 	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ F* | *Sun*Fortran*)
--	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
--	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
--	  ;;
- 	*Sun\ C*)
- 	  # Sun C 5.9
- 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+	  ;;
- 	esac
- 	;;
-       esac
-@@ -4113,7 +4072,7 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       case $cc_basename in
--      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-+      f77* | f90* | f95*)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-       *)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4223,10 +4182,8 @@
-   aix[[4-9]]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
--    # Also, AIX nm treats weak defined symbols like other global defined
--    # symbols, whereas GNU nm marks them as "W".
-     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     else
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     fi
-@@ -4237,6 +4194,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)
-+    _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'
-   ;;
-@@ -4301,36 +4261,13 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
--
--  # On some targets, GNU ld is compatible enough with the native linker
--  # that we're better off using the native interface for both.
--  lt_use_gnu_ld_interface=no
-   if test "$with_gnu_ld" = yes; then
--    case $host_os in
--      aix*)
--	# The AIX port of GNU ld has always aspired to compatibility
--	# with the native linker.  However, as the warning in the GNU ld
--	# block says, versions before 2.19.5* couldn't really create working
--	# shared libraries, regardless of the interface used.
--	case `$LD -v 2>&1` in
--	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
--	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
--	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
--	  *)
--	    lt_use_gnu_ld_interface=yes
--	    ;;
--	esac
--	;;
--      *)
--	lt_use_gnu_ld_interface=yes
--	;;
--    esac
--  fi
--
--  if test "$lt_use_gnu_ld_interface" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-@@ -4364,12 +4301,11 @@
- 	_LT_TAGVAR(ld_shlibs, $1)=no
- 	cat <<_LT_EOF 1>&2
- 
--*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
- *** to be unable to reliably create shared libraries on AIX.
- *** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to install binutils
--*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
--*** You will then need to restart the configuration process.
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
- 
- _LT_EOF
-       fi
-@@ -4405,7 +4341,6 @@
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_TAGVAR(always_export_symbols, $1)=no
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -4427,11 +4362,6 @@
-       fi
-       ;;
- 
--    haiku*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
-     interix[[3-9]]*)
-       _LT_TAGVAR(hardcode_direct, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4461,12 +4391,11 @@
- 	tmp_sharedflag='-shared'
- 	case $cc_basename,$host_cpu in
-         pgcc*)				# Portland Group C compiler
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag'
- 	  ;;
--	pgf77* | pgf90* | pgf95* | pgfortran*)
--					# Portland Group f77 and f90 compilers
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag -Mnomain' ;;
- 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
- 	  tmp_addflag=' -i_dynamic' ;;
-@@ -4477,17 +4406,13 @@
- 	lf95*)				# Lahey Fortran 8.1
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
- 	  tmp_sharedflag='--shared' ;;
--	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
- 	  tmp_sharedflag='-qmkshrobj'
- 	  tmp_addflag= ;;
--	nvcc*)	# Cuda Compiler Driver 2.2
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  _LT_TAGVAR(compiler_needs_object, $1)=yes
--	  ;;
- 	esac
- 	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)			# Sun C 5.9
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
- 	  tmp_sharedflag='-G' ;;
- 	*Sun\ F*)			# Sun Fortran 8.3
-@@ -4503,17 +4428,17 @@
-         fi
- 
- 	case $cc_basename in
--	xlf* | bgf* | bgxlf* | mpixlf*)
-+	xlf*)
- 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- 	  fi
- 	  ;;
- 	esac
-@@ -4522,7 +4447,7 @@
-       fi
-       ;;
- 
--    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=
-@@ -4634,10 +4559,8 @@
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	# Also, AIX nm treats weak defined symbols like other global
--	# defined symbols, whereas GNU nm marks them as "W".
- 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	else
- 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	fi
-@@ -4699,6 +4622,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -4726,7 +4650,7 @@
-         # empty executable.
-         _LT_SYS_MODULE_PATH_AIX
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
- 	if test "$host_cpu" = ia64; then
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4741,13 +4665,8 @@
- 	  # -berok will link without error, but may produce a broken library.
- 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  if test "$with_gnu_ld" = yes; then
--	    # We only use this code for GNU lds that support --whole-archive.
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	  else
--	    # Exported symbols can be pulled into shared objects from archives
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	  fi
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -4786,7 +4705,7 @@
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-@@ -4853,7 +4772,7 @@
-       ;;
- 
-     hpux10*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -4872,7 +4791,7 @@
-       ;;
- 
-     hpux11*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case $host_cpu in
- 	hppa*64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -4893,14 +4812,7 @@
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	m4_if($1, [], [
--	  # Older versions of the 11.00 compiler do not understand -b yet
--	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
--	  _LT_LINKER_OPTION([if $CC understands -b],
--	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
--	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
--	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
--	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-@@ -4928,19 +4840,19 @@
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	# Try to use the -exported_symbol ld option, if it does not
- 	# work, assume that -exports_file does not work either and
- 	# implicitly export all symbols.
-         save_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-         AC_LINK_IFELSE(int foo(void) {},
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-         )
-         LDFLAGS="$save_LDFLAGS"
-       else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
-       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4949,7 +4861,7 @@
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    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
-@@ -5002,17 +4914,17 @@
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-     osf3*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
-       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5022,13 +4934,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-       else
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5219,38 +5131,36 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
--	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
--	[$RM conftest*
--	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
--	  soname=conftest
--	  lib=conftest
--	  libobjs=conftest.$ac_objext
--	  deplibs=
--	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
--	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
--	  compiler_flags=-v
--	  linker_flags=-v
--	  verstring=
--	  output_objdir=.
--	  libname=conftest
--	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
--	  _LT_TAGVAR(allow_undefined_flag, $1)=
--	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
--	  then
--	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	  else
--	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  fi
--	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--	else
--	  cat conftest.err 1>&5
--	fi
--	$RM conftest*
--	])
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+        _LT_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-       ;;
-     esac
-   fi
-@@ -5420,14 +5330,14 @@
- ])# _LT_LANG_C_CONFIG
- 
- 
--# _LT_LANG_CXX_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a C++ compiler are suitably
--# defined.  These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_CXX_CONFIG],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
-+# _LT_PROG_CXX
-+# ------------
-+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-+# compiler, we have our own version here.
-+m4_defun([_LT_PROG_CXX],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-+AC_PROG_CXX
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
-@@ -5435,6 +5345,22 @@
- else
-   _lt_caught_CXX_error=yes
- fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_CXX
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_CXX], [])
-+
-+
-+# _LT_LANG_CXX_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a C++ compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_CXX_CONFIG],
-+[AC_REQUIRE([_LT_PROG_CXX])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
- 
- AC_LANG_PUSH(C++)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5456,8 +5382,6 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -5560,7 +5484,7 @@
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 
-     else
-       GXX=no
-@@ -5672,7 +5596,7 @@
-           _LT_SYS_MODULE_PATH_AIX
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-         else
-           if test "$host_cpu" = ia64; then
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5687,13 +5611,8 @@
- 	    # -berok will link without error, but may produce a broken library.
- 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	    if test "$with_gnu_ld" = yes; then
--	      # We only use this code for GNU lds that support --whole-archive.
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	    else
--	      # Exported symbols can be pulled into shared objects from archives
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	    fi
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	    # This is similar to how AIX traditionally builds its shared
- 	    # libraries.
-@@ -5726,7 +5645,6 @@
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-         # as there is no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-         _LT_TAGVAR(always_export_symbols, $1)=no
-         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -5787,11 +5705,6 @@
-       gnu*)
-         ;;
- 
--      haiku*)
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(link_all_deplibs, $1)=yes
--        ;;
--
-       hpux9*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5816,7 +5729,7 @@
-             # explicitly linking system object files so we need to strip them
-             # from the output so that they don't get included in the library
-             # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-             ;;
-           *)
-             if test "$GXX" = yes; then
-@@ -5881,7 +5794,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
-           *)
- 	    if test "$GXX" = yes; then
-@@ -5924,7 +5837,7 @@
-         case $cc_basename in
-           CC*)
- 	    # SGI C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -5935,9 +5848,9 @@
-           *)
- 	    if test "$GXX" = yes; then
- 	      if test "$with_gnu_ld" = no; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	      else
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
- 	      fi
- 	    fi
- 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5966,7 +5879,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6003,26 +5916,26 @@
-           pgCC* | pgcpp*)
-             # Portland Group C++ compiler
- 	    case `$CC -V` in
--	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
- 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
- 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
- 		$RANLIB $oldlib'
- 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
--	    *) # Version 6 and above use weak symbols
-+	    *) # Version 6 will use weak symbols
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
-@@ -6030,7 +5943,7 @@
- 
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-             ;;
- 	  cxx*)
- 	    # Compaq C++
-@@ -6049,9 +5962,9 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
--	  xl* | mpixl* | bgxl*)
-+	  xl*)
- 	    # IBM XL 8.0 on PPC, with GNU ld
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6071,13 +5984,13 @@
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
- 
- 	      # Not sure whether something based on
- 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- 	      # would be better.
--	      output_verbose_link_cmd='func_echo_all'
-+	      output_verbose_link_cmd='echo'
- 
- 	      # Archives containing C++ object files must be created using
- 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -6146,7 +6059,7 @@
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- 	  fi
--	  output_verbose_link_cmd=func_echo_all
-+	  output_verbose_link_cmd=echo
- 	else
- 	  _LT_TAGVAR(ld_shlibs, $1)=no
- 	fi
-@@ -6181,15 +6094,15 @@
- 	    case $host in
- 	      osf3*)
- 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 		;;
- 	      *)
- 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
- 	          $RM $lib.exp'
- 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- 		;;
-@@ -6205,17 +6118,17 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
- 	  *)
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	      case $host in
- 	        osf3*)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	        *)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	      esac
- 
-@@ -6225,7 +6138,7 @@
- 	      # Commands to make compiler produce verbose output that lists
- 	      # what "hidden" libraries, object files and flags are used when
- 	      # linking a shared library.
--	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 
- 	    else
- 	      # FIXME: insert proper C++ library support
-@@ -6261,7 +6174,7 @@
- 
-       solaris*)
-         case $cc_basename in
--          CC* | sunCC*)
-+          CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
-             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6282,7 +6195,7 @@
- 	    esac
- 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
- 
--	    output_verbose_link_cmd='func_echo_all'
-+	    output_verbose_link_cmd='echo'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -6309,7 +6222,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
-@@ -6320,7 +6233,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 	      fi
- 
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6374,10 +6287,6 @@
-           CC*)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
--	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
--	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
--	      '"$_LT_TAGVAR(reload_cmds, $1)"
- 	    ;;
- 	  *)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6624,7 +6533,7 @@
- 
- solaris*)
-   case $cc_basename in
--  CC* | sunCC*)
-+  CC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6668,16 +6577,32 @@
- ])# _LT_SYS_HIDDEN_LIBDEPS
- 
- 
-+# _LT_PROG_F77
-+# ------------
-+# Since AC_PROG_F77 is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_F77],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-+AC_PROG_F77
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+  _lt_disable_F77=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_F77
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_F77], [])
-+
-+
- # _LT_LANG_F77_CONFIG([TAG])
- # --------------------------
- # Ensure that the configuration variables for a Fortran 77 compiler are
- # suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
- m4_defun([_LT_LANG_F77_CONFIG],
--[AC_LANG_PUSH(Fortran 77)
--if test -z "$F77" || test "X$F77" = "Xno"; then
--  _lt_disable_F77=yes
--fi
-+[AC_REQUIRE([_LT_PROG_F77])dnl
-+AC_LANG_PUSH(Fortran 77)
- 
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6696,8 +6621,6 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6797,17 +6720,32 @@
- ])# _LT_LANG_F77_CONFIG
- 
- 
-+# _LT_PROG_FC
-+# -----------
-+# Since AC_PROG_FC is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_FC],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-+AC_PROG_FC
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_FC
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_FC], [])
-+
-+
- # _LT_LANG_FC_CONFIG([TAG])
- # -------------------------
- # Ensure that the configuration variables for a Fortran compiler are
- # suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
- m4_defun([_LT_LANG_FC_CONFIG],
--[AC_LANG_PUSH(Fortran)
--
--if test -z "$FC" || test "X$FC" = "Xno"; then
--  _lt_disable_FC=yes
--fi
-+[AC_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
- 
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6826,8 +6764,6 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6973,8 +6909,6 @@
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- 
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- 
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
-@@ -7342,7 +7276,7 @@
- func_dirname ()
- {
-   # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-   if test "X$func_dirname_result" = "X${1}"; then
-     func_dirname_result="${3}"
-   else
-@@ -7353,7 +7287,7 @@
- # func_basename file
- func_basename ()
- {
--  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
- 
- dnl func_dirname_and_basename
-@@ -7369,8 +7303,10 @@
- func_stripname ()
- {
-   case ${2} in
--    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-   esac
- }
- 
-@@ -7381,20 +7317,20 @@
- # func_opt_split
- func_opt_split ()
- {
--  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
- }
- 
- # func_lo2o object
- func_lo2o ()
- {
--  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
- }
- 
- # func_xform libobj-or-source
- func_xform ()
- {
--  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
- }
- 
- # func_arith arithmetic-term...
-Index: cairo/build/ltmain.sh
-===================================================================
---- cairo.orig/build/ltmain.sh	2010-09-06 23:50:27.143408606 +0200
-+++ cairo/build/ltmain.sh	2010-09-06 23:49:58.743416695 +0200
-@@ -1,10 +1,9 @@
- # Generated from ltmain.m4sh.
- 
--# libtool (GNU libtool) 2.2.10
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions.  There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-@@ -33,54 +32,50 @@
- #
- # Provide generalized library-building support services.
- #
--#       --config             show all configuration variables
--#       --debug              enable verbose shell tracing
--#   -n, --dry-run            display commands without modifying any files
--#       --features           display basic configuration information and exit
--#       --mode=MODE          use operation mode MODE
--#       --preserve-dup-deps  don't remove duplicate dependency libraries
--#       --quiet, --silent    don't print informational messages
--#       --no-quiet, --no-silent
--#                            print informational messages (default)
--#       --tag=TAG            use configuration variables from tag TAG
--#   -v, --verbose            print more informational messages than default
--#       --no-verbose         don't print the extra informational messages
--#       --version            print version information
--#   -h, --help, --help-all   print short, long, or detailed help message
-+#     --config             show all configuration variables
-+#     --debug              enable verbose shell tracing
-+# -n, --dry-run            display commands without modifying any files
-+#     --features           display basic configuration information and exit
-+#     --mode=MODE          use operation mode MODE
-+#     --preserve-dup-deps  don't remove duplicate dependency libraries
-+#     --quiet, --silent    don't print informational messages
-+#     --tag=TAG            use configuration variables from tag TAG
-+# -v, --verbose            print informational messages (default)
-+#     --version            print version information
-+# -h, --help               print short or long help message
- #
- # MODE must be one of the following:
- #
--#         clean              remove files from the build directory
--#         compile            compile a source file into a libtool object
--#         execute            automatically set library path, then run a program
--#         finish             complete the installation of libtool libraries
--#         install            install libraries or executables
--#         link               create a library or an executable
--#         uninstall          remove libraries from an installed directory
-+#       clean              remove files from the build directory
-+#       compile            compile a source file into a libtool object
-+#       execute            automatically set library path, then run a program
-+#       finish             complete the installation of libtool libraries
-+#       install            install libraries or executables
-+#       link               create a library or an executable
-+#       uninstall          remove libraries from an installed directory
- #
--# MODE-ARGS vary depending on the MODE.  When passed as first option,
--# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-+# MODE-ARGS vary depending on the MODE.
- # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
- #
- # When reporting a bug, please describe a test case to reproduce it and
- # include the following information:
- #
--#         host-triplet:	$host
--#         shell:		$SHELL
--#         compiler:		$LTCC
--#         compiler flags:		$LTCFLAGS
--#         linker:		$LD (gnu? $with_gnu_ld)
--#         $progname:	(GNU libtool) 2.2.10
--#         automake:	$automake_version
--#         autoconf:	$autoconf_version
-+#       host-triplet:	$host
-+#       shell:		$SHELL
-+#       compiler:		$LTCC
-+#       compiler flags:		$LTCFLAGS
-+#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
- 
--PROGRAM=libtool
-+PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.10
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
--package_revision=1.3175
-+package_revision=1.3017
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -96,15 +91,10 @@
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--$1
--_LTECHO_EOF'
--}
--
- # NLS nuisances: We save the old values to restore during execute mode.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -117,24 +107,15 @@
- 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- 	fi"
- done
--LC_ALL=C
--LANGUAGE=C
--export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
--# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--# is ksh but when the shell is invoked as "sh" and the current value of
--# the _XPG environment variable is not equal to 1 (one), the special
--# positional parameter $0, within a function call, is the name of the
--# function.
--progpath="$0"
- 
- 
- 
- : ${CP="cp -f"}
--test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-+: ${ECHO="echo"}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -178,168 +159,32 @@
- func_dirname_and_basename ()
- {
-   # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-   if test "X$func_dirname_result" = "X${1}"; then
-     func_dirname_result="${3}"
-   else
-     func_dirname_result="$func_dirname_result${2}"
-   fi
--  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
- 
- # Generated shell functions inserted here.
- 
--# These SED scripts presuppose an absolute path with a trailing slash.
--pathcar='s,^/\([^/]*\).*$,\1,'
--pathcdr='s,^/[^/]*,,'
--removedotparts=':dotsl
--		s@/\./@/@g
--		t dotsl
--		s,/\.$,/,'
--collapseslashes='s@/\{1,\}@/@g'
--finalslash='s,/*$,/,'
--
--# func_normal_abspath PATH
--# Remove doubled-up and trailing slashes, "." path components,
--# and cancel out any ".." path components in PATH after making
--# it an absolute path.
--#             value returned in "$func_normal_abspath_result"
--func_normal_abspath ()
--{
--  # Start from root dir and reassemble the path.
--  func_normal_abspath_result=
--  func_normal_abspath_tpath=$1
--  func_normal_abspath_altnamespace=
--  case $func_normal_abspath_tpath in
--    "")
--      # Empty path, that just means $cwd.
--      func_stripname '' '/' "`pwd`"
--      func_normal_abspath_result=$func_stripname_result
--      return
--    ;;
--    # The next three entries are used to spot a run of precisely
--    # two leading slashes without using negated character classes;
--    # we take advantage of case's first-match behaviour.
--    ///*)
--      # Unusual form of absolute path, do nothing.
--    ;;
--    //*)
--      # Not necessarily an ordinary path; POSIX reserves leading '//'
--      # and for example Cygwin uses it to access remote file shares
--      # over CIFS/SMB, so we conserve a leading double slash if found.
--      func_normal_abspath_altnamespace=/
--    ;;
--    /*)
--      # Absolute path, do nothing.
--    ;;
--    *)
--      # Relative path, prepend $cwd.
--      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
--    ;;
--  esac
--  # Cancel out all the simple stuff to save iterations.  We also want
--  # the path to end with a slash for ease of parsing, so make sure
--  # there is one (and only one) here.
--  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
--  while :; do
--    # Processed it all yet?
--    if test "$func_normal_abspath_tpath" = / ; then
--      # If we ascended to the root using ".." the result may be empty now.
--      if test -z "$func_normal_abspath_result" ; then
--        func_normal_abspath_result=/
--      fi
--      break
--    fi
--    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$pathcar"`
--    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$pathcdr"`
--    # Figure out what to do with it
--    case $func_normal_abspath_tcomponent in
--      "")
--        # Trailing empty path component, ignore it.
--      ;;
--      ..)
--        # Parent dir; strip last assembled component from result.
--        func_dirname "$func_normal_abspath_result"
--        func_normal_abspath_result=$func_dirname_result
--      ;;
--      *)
--        # Actual path component, append it.
--        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
--      ;;
--    esac
--  done
--  # Restore leading double-slash if one was found on entry.
--  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
--}
--
--# func_relative_path SRCDIR DSTDIR
--# generates a relative path from SRCDIR to DSTDIR, with a trailing
--# slash if non-empty, suitable for immediately appending a filename
--# without needing to append a separator.
--#             value returned in "$func_relative_path_result"
--func_relative_path ()
--{
--  func_relative_path_result=
--  func_normal_abspath "$1"
--  func_relative_path_tlibdir=$func_normal_abspath_result
--  func_normal_abspath "$2"
--  func_relative_path_tbindir=$func_normal_abspath_result
--
--  # Ascend the tree starting from libdir
--  while :; do
--    # check if we have found a prefix of bindir
--    case $func_relative_path_tbindir in
--      $func_relative_path_tlibdir)
--        # found an exact match
--        func_relative_path_tcancelled=
--        break
--        ;;
--      $func_relative_path_tlibdir*)
--        # found a matching prefix
--        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
--        func_relative_path_tcancelled=$func_stripname_result
--        if test -z "$func_relative_path_result"; then
--          func_relative_path_result=.
--        fi
--        break
--        ;;
--      *)
--        func_dirname $func_relative_path_tlibdir
--        func_relative_path_tlibdir=${func_dirname_result}
--        if test "x$func_relative_path_tlibdir" = x ; then
--          # Have to descend all the way to the root!
--          func_relative_path_result=../$func_relative_path_result
--          func_relative_path_tcancelled=$func_relative_path_tbindir
--          break
--        fi
--        func_relative_path_result=../$func_relative_path_result
--        ;;
--    esac
--  done
--
--  # Now calculate path; take care to avoid doubling-up slashes.
--  func_stripname '' '/' "$func_relative_path_result"
--  func_relative_path_result=$func_stripname_result
--  func_stripname '/' '/' "$func_relative_path_tcancelled"
--  if test "x$func_stripname_result" != x ; then
--    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
--  fi
--
--  # Normalisation. If bindir is libdir, return empty string,
--  # else relative path ending with a slash; either way, target
--  # file name can be directly appended.
--  if test ! -z "$func_relative_path_result"; then
--    func_stripname './' '' "$func_relative_path_result/"
--    func_relative_path_result=$func_stripname_result
--  fi
--}
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
- 
- # The name of this program:
-+# In the unlikely event $progname began with a '-', it would play havoc with
-+# func_echo (imagine progname=-n), so we prepend ./ in that case:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
-+case $progname in
-+  -*) progname=./$progname ;;
-+esac
- 
- # Make sure we have an absolute path for reexecution:
- case $progpath in
-@@ -413,13 +258,6 @@
-     :
- }
- 
--# func_echo_all arg...
--# Invoke $ECHO with all args, space-separated.
--func_echo_all ()
--{
--    $ECHO "$*"
--}
--
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
-@@ -488,9 +326,9 @@
-         case $my_directory_path in */*) ;; *) break ;; esac
- 
-         # ...otherwise throw away the child directory and loop
--        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-       done
--      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
- 
-       save_mkdir_p_IFS="$IFS"; IFS=':'
-       for my_dir in $my_dir_list; do
-@@ -540,7 +378,7 @@
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
--    $ECHO "$my_tmpdir"
-+    $ECHO "X$my_tmpdir" | $Xsed
- }
- 
- 
-@@ -554,7 +392,7 @@
- {
-     case $1 in
-       *[\\\`\"\$]*)
--	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
-@@ -581,7 +419,7 @@
- {
-     case $1 in
-       *[\\\`\"]*)
--	my_arg=`$ECHO "$1" | $SED \
-+	my_arg=`$ECHO "X$1" | $Xsed \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-@@ -651,19 +489,14 @@
- }
- 
- 
-+
-+
-+
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
--    $SED -n '/(C)/!b go
--	:more
--	/\./!{
--	  N
--	  s/\n# / /
--	  b more
--	}
--	:go
--	/^# '$PROGRAM' (GNU /,/# warranty; / {
-+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-         s/^# //
- 	s/^# *$//
-         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -676,20 +509,19 @@
- # Echo short help message to standard output and exit.
- func_usage ()
- {
--    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-+    $SED -n '/^# Usage:/,/# -h/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
--    echo
-+    $ECHO
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
--# func_help [NOEXIT]
--# Echo long help message to standard output and exit,
--# unless 'noexit' is passed as argument.
-+# func_help
-+# Echo long help message to standard output and exit.
- func_help ()
- {
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
-@@ -706,10 +538,7 @@
- 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
- 	p
-      }' < "$progpath"
--    ret=$?
--    if test -z "$1"; then
--      exit $ret
--    fi
-+    exit $?
- }
- 
- # func_missing_arg argname
-@@ -717,7 +546,7 @@
- # exit_cmd.
- func_missing_arg ()
- {
--    func_error "missing argument for $1."
-+    func_error "missing argument for $1"
-     exit_cmd=exit
- }
- 
-@@ -727,6 +556,29 @@
- 
- 
- 
-+# Check that we have a working $ECHO.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $ECHO will work.
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit $EXIT_SUCCESS
-+fi
- 
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
-@@ -784,16 +636,16 @@
- # Display the features supported by this script.
- func_features ()
- {
--    echo "host: $host"
-+    $ECHO "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      echo "enable shared libraries"
-+      $ECHO "enable shared libraries"
-     else
--      echo "disable shared libraries"
-+      $ECHO "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      echo "enable static libraries"
-+      $ECHO "enable static libraries"
-     else
--      echo "disable static libraries"
-+      $ECHO "disable static libraries"
-     fi
- 
-     exit $?
-@@ -920,21 +772,10 @@
- 
-       --quiet|--silent)	preserve_args="$preserve_args $opt"
- 			opt_silent=:
--			opt_verbose=false
--			;;
--
--      --no-quiet|--no-silent)
--			preserve_args="$preserve_args $opt"
--			opt_silent=false
- 			;;
- 
-       --verbose| -v)	preserve_args="$preserve_args $opt"
- 			opt_silent=false
--			opt_verbose=:
--			;;
--
--      --no-verbose)	preserve_args="$preserve_args $opt"
--			opt_verbose=false
- 			;;
- 
-       --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-@@ -952,7 +793,6 @@
- 
-       -\?|-h)		func_usage					;;
-       --help)		opt_help=:					;;
--      --help-all)	opt_help=': help-all'				;;
-       --version)	func_version					;;
- 
-       -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-@@ -1176,13 +1016,10 @@
-         func_quote_for_eval "$arg"
- 	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-       done
--      CC_expanded=`func_echo_all $CC`
--      CC_quoted_expanded=`func_echo_all $CC_quoted`
-       case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
--      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
-@@ -1196,11 +1033,8 @@
- 	      func_quote_for_eval "$arg"
- 	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
- 	    done
--	    CC_expanded=`func_echo_all $CC`
--	    CC_quoted_expanded=`func_echo_all $CC_quoted`
- 	    case "$@ " in
--	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
--	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
-@@ -1379,7 +1213,7 @@
-     *.[cCFSifmso] | \
-     *.ada | *.adb | *.ads | *.asm | \
-     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
--    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-       func_xform "$libobj"
-       libobj=$func_xform_result
-       ;;
-@@ -1454,7 +1288,7 @@
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-@@ -1611,7 +1445,7 @@
- }
- 
- $opt_help || {
--  test "$mode" = compile && func_mode_compile ${1+"$@"}
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
-@@ -1648,11 +1482,10 @@
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
--  -prefer-pic       try to build PIC objects only
--  -prefer-non-pic   try to build non-PIC objects only
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
--  -Wc,FLAG          pass FLAG directly to the compiler
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
- from the given SOURCEFILE.
-@@ -1705,7 +1538,7 @@
- 
- The following components of INSTALL-COMMAND are treated specially:
- 
--  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
- The rest of the components are interpreted as arguments to that command (only
- BSD-compatible install options are recognized)."
-@@ -1725,8 +1558,6 @@
- 
-   -all-static       do not do any dynamic linking at all
-   -avoid-version    do not add a version suffix if possible
--  -bindir BINDIR    specify path to binaries directory (for systems where
--                    libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1755,11 +1586,6 @@
-   -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
-   -weak LIBNAME     declare that the target provides the LIBNAME interface
--  -Wc,FLAG
--  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
--  -Wl,FLAG
--  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
--  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
- 
- All other options (arguments beginning with \`-') are ignored.
- 
-@@ -1797,40 +1623,14 @@
-         ;;
-     esac
- 
--    echo
-+    $ECHO
-     $ECHO "Try \`$progname --help' for more information about other modes."
-+
-+    exit $?
- }
- 
--# Now that we've collected a possible --mode arg, show help if necessary
--if $opt_help; then
--  if test "$opt_help" = :; then
--    func_mode_help
--  else
--    {
--      func_help noexit
--      for mode in compile link execute install finish uninstall clean; do
--	func_mode_help
--      done
--    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
--    {
--      func_help noexit
--      for mode in compile link execute install finish uninstall clean; do
--	echo
--	func_mode_help
--      done
--    } |
--    sed '1d
--      /^When reporting/,/^Report/{
--	H
--	d
--      }
--      $x
--      /information about other modes/d
--      /more detailed .*MODE/d
--      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
--  fi
--  exit $?
--fi
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
- 
- 
- # func_mode_execute arg...
-@@ -1912,7 +1712,7 @@
-     for file
-     do
-       case $file in
--      -* | *.la | *.lo ) ;;
-+      -*) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
- 	if func_ltwrapper_script_p "$file"; then
-@@ -1954,7 +1754,7 @@
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
--	echo "export $shlibpath_var"
-+	$ECHO "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-@@ -1995,23 +1795,23 @@
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    $ECHO "Libraries have been installed in:"
-     for libdir in $libdirs; do
-       $ECHO "   $libdir"
-     done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
-+    $ECHO
-+    $ECHO "If you ever happen to want to link against installed libraries"
-+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $ECHO "flag during linking and do at least one of the following:"
-     if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
-+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $ECHO "     during execution"
-     fi
-     if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
-+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $ECHO "     during linking"
-     fi
-     if test -n "$hardcode_libdir_flag_spec"; then
-       libdir=LIBDIR
-@@ -2023,21 +1823,21 @@
-       $ECHO "   - have your system administrator run these commands:$admincmds"
-     fi
-     if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-     fi
--    echo
-+    $ECHO
- 
--    echo "See any operating system documentation about shared libraries for"
-+    $ECHO "See any operating system documentation about shared libraries for"
-     case $host in
-       solaris2.[6789]|solaris2.1[0-9])
--        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
--	echo "pages."
-+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	$ECHO "pages."
- 	;;
-       *)
--        echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-         ;;
-     esac
--    echo "----------------------------------------------------------------------"
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-     exit $EXIT_SUCCESS
- }
- 
-@@ -2052,7 +1852,7 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       case $nonopt in *shtool*) :;; *) false;; esac; then
-+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-       # Aesthetically quote it.
-       func_quote_for_eval "$nonopt"
-       install_prog="$func_quote_for_eval_result "
-@@ -2067,11 +1867,6 @@
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
-     install_prog="$install_prog$func_quote_for_eval_result"
--    install_shared_prog=$install_prog
--    case " $install_prog " in
--      *[\\\ /]cp\ *) install_cp=: ;;
--      *) install_cp=false ;;
--    esac
- 
-     # We need to accept at least all the BSD install flags.
-     dest=
-@@ -2081,10 +1876,8 @@
-     install_type=
-     isdir=no
-     stripme=
--    no_mode=:
-     for arg
-     do
--      arg2=
-       if test -n "$dest"; then
- 	files="$files $dest"
- 	dest=$arg
-@@ -2094,9 +1887,10 @@
-       case $arg in
-       -d) isdir=yes ;;
-       -f)
--	if $install_cp; then :; else
--	  prev=$arg
--	fi
-+	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
- 	;;
-       -g | -m | -o)
- 	prev=$arg
-@@ -2110,10 +1904,6 @@
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
--	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
--	    arg2=$install_override_mode
--	    no_mode=false
--	  fi
- 	  prev=
- 	else
- 	  dest=$arg
-@@ -2125,10 +1915,6 @@
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
-       install_prog="$install_prog $func_quote_for_eval_result"
--      if test -n "$arg2"; then
--	func_quote_for_eval "$arg2"
--      fi
--      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-@@ -2137,13 +1923,6 @@
-     test -n "$prev" && \
-       func_fatal_help "the \`$prev' option requires an argument"
- 
--    if test -n "$install_override_mode" && $no_mode; then
--      if $install_cp; then :; else
--	func_quote_for_eval "$install_override_mode"
--	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
--      fi
--    fi
--
-     if test -z "$files"; then
-       if test -z "$dest"; then
- 	func_fatal_help "no file or destination specified"
-@@ -2231,7 +2010,7 @@
- 
- 	if test -n "$relink_command"; then
- 	  # Determine the prefix the user has applied to our future dir.
--	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
- 
- 	  # Don't allow the user to place us outside of our expected
- 	  # location b/c this prevents finding dependent libraries that
-@@ -2244,9 +2023,9 @@
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- 	  else
--	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
- 	  fi
- 
- 	  func_warning "relinking \`$file'"
-@@ -2264,7 +2043,7 @@
- 	  test -n "$relink_command" && srcname="$realname"T
- 
- 	  # Install the shared library and build the symlinks.
--	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
-@@ -2404,7 +2183,7 @@
- 	    if test -f "$lib"; then
- 	      func_source "$lib"
- 	    fi
--	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
-@@ -2423,7 +2202,7 @@
- 		file="$func_basename_result"
- 	        outputname="$tmpdir/$file"
- 	        # Replace the output file specification.
--	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
- 
- 	        $opt_silent || {
- 	          func_quote_for_expand "$relink_command"
-@@ -2442,7 +2221,7 @@
- 	    }
- 	  else
- 	    # Install the binary that we compiled earlier.
--	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
-@@ -2544,10 +2323,6 @@
- extern \"C\" {
- #endif
- 
--#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
--#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
--#endif
--
- /* External symbol declarations for the compiler. */\
- "
- 
-@@ -2557,7 +2332,7 @@
- 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
- 
- 	  # Add our own program objects to the symbol list.
--	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 	  for progfile in $progfiles; do
- 	    func_verbose "extracting global C symbols from \`$progfile'"
- 	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-@@ -2596,7 +2371,7 @@
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin* | *mingw* | *cegcc* )
-+	        *cygwin | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -2640,10 +2415,10 @@
- 	  if test -f "$nlist"S; then
- 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
--	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
- 
--	  echo >> "$output_objdir/$my_dlsyms" "\
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
- 
- /* The mapping between symbol names and symbols.  */
- typedef struct {
-@@ -2653,7 +2428,7 @@
- "
- 	  case $host in
- 	  *cygwin* | *mingw* | *cegcc* )
--	    echo >> "$output_objdir/$my_dlsyms" "\
-+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
- /* DATA imports from DLLs on WIN32 con't be const, because
-    runtime relocations are performed -- see ld's documentation
-    on pseudo-relocs.  */"
-@@ -2666,7 +2441,7 @@
- 	    lt_dlsym_const=const ;;
- 	  esac
- 
--	  echo >> "$output_objdir/$my_dlsyms" "\
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
- extern $lt_dlsym_const lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
- $lt_dlsym_const lt_dlsymlist
-@@ -2682,7 +2457,7 @@
- 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  esac
--	  echo >> "$output_objdir/$my_dlsyms" "\
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-   {0, (void *) 0}
- };
- 
-@@ -2740,16 +2515,16 @@
- 	case $host in
- 	*cygwin* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
--	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
--	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	  else
--	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
--	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  fi
- 	  ;;
- 	*)
--	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
--	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  ;;
- 	esac
- 	;;
-@@ -2763,8 +2538,8 @@
-       # really was required.
- 
-       # Nullify the symbol file.
--      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
--      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-     fi
- }
- 
-@@ -2774,7 +2549,6 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--# Despite the name, also deal with 64 bit binaries.
- func_win32_libid ()
- {
-   $opt_debug
-@@ -2785,9 +2559,8 @@
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
--    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-       win32_nmres=`eval $NM -f posix -A $1 |
- 	$SED -n -e '
- 	    1,100{
-@@ -2825,18 +2598,7 @@
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
--    if test "$lock_old_archive_extraction" = yes; then
--      lockfile=$f_ex_an_ar_oldlib.lock
--      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
--	func_echo "Waiting for $lockfile to be removed"
--	sleep 2
--      done
--    fi
--    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
--		   'stat=$?; rm -f "$lockfile"; exit $stat'
--    if test "$lock_old_archive_extraction" = yes; then
--      $opt_dry_run || rm -f "$lockfile"
--    fi
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-      :
-     else
-@@ -2907,7 +2669,7 @@
- 	    darwin_file=
- 	    darwin_files=
- 	    for darwin_file in $darwin_filelist; do
--	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- 	      $LIPO -create -output "$darwin_file" $darwin_files
- 	    done # $darwin_filelist
- 	    $RM -rf unfat-$$
-@@ -2922,30 +2684,25 @@
-         func_extract_an_archive "$my_xdir" "$my_xabs"
- 	;;
-       esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
- }
- 
- 
--# 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.
-+
-+# func_emit_wrapper_part1 [arg=no]
- #
--# 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=${1-no}
-+# Emit the first part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part1 ()
-+{
-+	func_emit_wrapper_part1_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part1_arg1=$1
-+	fi
- 
- 	$ECHO "\
- #! $SHELL
-@@ -2961,6 +2718,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # Be Bourne compatible
-@@ -2991,132 +2749,31 @@
- else
-   # When we are sourced in execute mode, \$file and \$ECHO are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
--    file=\"\$0\""
--
--    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
--    $ECHO "\
--
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--\$1
--_LTECHO_EOF'
--}
--    ECHO=\"$qECHO\"
--  fi
--
--# Very basic option parsing. These options are (a) specific to
--# the libtool wrapper, (b) are identical between the wrapper
--# /script/ and the wrapper /executable/ which is used only on
--# windows platforms, and (c) all begin with the string "--lt-"
--# (application programs are unlikely to have options which match
--# this pattern).
--#
--# There are only two supported options: --lt-debug and
--# --lt-dump-script. There is, deliberately, no --lt-help.
--#
--# The first argument to this parsing function should be the
--# script's $0 value, followed by "$@".
--lt_option_debug=
--func_parse_lt_options ()
--{
--  lt_script_arg0=\$0
--  shift
--  for lt_opt
--  do
--    case \"\$lt_opt\" in
--    --lt-debug) lt_option_debug=1 ;;
--    --lt-dump-script)
--        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
--        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
--        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
--        cat \"\$lt_dump_D/\$lt_dump_F\"
--        exit 0
--      ;;
--    --lt-*)
--        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
--        exit 1
--      ;;
--    esac
--  done
--
--  # Print the debug banner immediately:
--  if test -n \"\$lt_option_debug\"; then
--    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
--  fi
--}
--
--# Used when --lt-debug. Prints its arguments to stdout
--# (redirection is the responsibility of the caller)
--func_lt_dump_args ()
--{
--  lt_dump_args_N=1;
--  for lt_arg
--  do
--    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
--    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
--  done
--}
--
--# Core function for launching the target application
--func_exec_program_core ()
--{
--"
--  case $host in
--  # Backslashes separate directories on plain windows
--  *-*-mingw | *-*-os2* | *-cegcc*)
--    $ECHO "\
--      if test -n \"\$lt_option_debug\"; then
--        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
--        func_lt_dump_args \${1+\"\$@\"} 1>&2
--      fi
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
--    ;;
--
--  *)
--    $ECHO "\
--      if test -n \"\$lt_option_debug\"; then
--        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
--        func_lt_dump_args \${1+\"\$@\"} 1>&2
--      fi
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+    ECHO=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$ECHO works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$ECHO will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
- "
--    ;;
--  esac
--  $ECHO "\
--      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
--      exit 1
--}
--
--# A function to encapsulate launching the target application
--# Strips options in the --lt-* namespace from \$@ and
--# launches target application with the remaining arguments.
--func_exec_program ()
--{
--  for lt_wr_arg
--  do
--    case \$lt_wr_arg in
--    --lt-*) ;;
--    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
--    esac
--    shift
--  done
--  func_exec_program_core \${1+\"\$@\"}
--}
--
--  # Parse options
--  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-+	$ECHO "\
- 
-   # Find the directory that this script lives in.
--  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
--    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-@@ -3126,13 +2783,30 @@
-       esac
-     fi
- 
--    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-+    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
-@@ -3140,7 +2814,7 @@
-     fi
-     # remove .libs from thisdir
-     case \"\$thisdir\" in
--    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-     $objdir )   thisdir=. ;;
-     esac
-   fi
-@@ -3203,7 +2877,7 @@
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
--    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
- 
-     export $shlibpath_var
- "
-@@ -3220,18 +2894,64 @@
- 	$ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
--      func_exec_program \${1+\"\$@\"}
-+"
-+	case $host in
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-     fi
-   else
-     # The program doesn't exist.
-     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
--    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit 1
-   fi
- fi\
- "
- }
-+# 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
-@@ -3258,19 +2978,23 @@
- func_to_host_path ()
- {
-   func_to_host_path_result="$1"
--  if test -n "$1"; then
-+  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
--            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
--              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-+            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_result=`cygpath -w "$1" |
--	      $SED -e "$lt_sed_naive_backslashify"`
-+            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
-@@ -3282,17 +3006,17 @@
-             # 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" |
-+              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=
-+              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 "  '$1'"
-           func_error "Continuing, but uninstalled executables may not work."
-           # Fallback:
-           func_to_host_path_result="$1"
-@@ -3325,24 +3049,30 @@
- func_to_host_pathlist ()
- {
-   func_to_host_pathlist_result="$1"
--  if test -n "$1"; then
-+  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_stripname : : "$1"
--        func_to_host_pathlist_tmp1=$func_stripname_result
-+        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.
--            func_to_host_pathlist_result=`
--	      ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
--	      $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-+            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_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
-+            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"`
-             ;;
-           * )
-@@ -3358,17 +3088,18 @@
-                   if test -z "$func_to_host_pathlist_result" ; then
-                     func_to_host_pathlist_result="$func_to_host_path_result"
-                   else
--                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
-+                    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
-+        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 "  '$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
-@@ -3385,7 +3116,7 @@
-             ;;
-         esac
-         case "$1" in
--          *: ) func_append func_to_host_pathlist_result ";"
-+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-             ;;
-         esac
-         ;;
-@@ -3410,23 +3141,31 @@
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
-+
-+   Currently, it simply execs the wrapper *script* "$SHELL $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
- */
- EOF
- 	    cat <<"EOF"
--#ifdef _MSC_VER
--# define _CRT_SECURE_NO_DEPRECATE 1
--#endif
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- # include <direct.h>
- # include <process.h>
- # include <io.h>
-+# define setmode _setmode
- #else
- # include <unistd.h>
- # include <stdint.h>
- # ifdef __CYGWIN__
- #  include <io.h>
-+#  define HAVE_SETENV
-+#  ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+#  endif
- # endif
- #endif
- #include <malloc.h>
-@@ -3438,44 +3177,6 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- 
--/* declarations of non-ANSI functions */
--#if defined(__MINGW32__)
--# ifdef __STRICT_ANSI__
--int _putenv (const char *);
--# endif
--#elif defined(__CYGWIN__)
--# ifdef __STRICT_ANSI__
--char *realpath (const char *, char *);
--int putenv (char *);
--int setenv (const char *, const char *, int);
--# endif
--/* #elif defined (other platforms) ... */
--#endif
--
--/* portability defines, excluding path handling macros */
--#if defined(_MSC_VER)
--# define setmode _setmode
--# define stat    _stat
--# define chmod   _chmod
--# define getcwd  _getcwd
--# define putenv  _putenv
--# define S_IXUSR _S_IEXEC
--# ifndef _INTPTR_T_DEFINED
--#  define _INTPTR_T_DEFINED
--#  define intptr_t int
--# endif
--#elif defined(__MINGW32__)
--# define setmode _setmode
--# define stat    _stat
--# define chmod   _chmod
--# define getcwd  _getcwd
--# define putenv  _putenv
--#elif defined(__CYGWIN__)
--# define HAVE_SETENV
--# define FOPEN_WB "wb"
--/* #elif defined (other platforms) ... */
--#endif
--
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
- #elif defined(MAXPATHLEN)
-@@ -3491,7 +3192,14 @@
- # define S_IXGRP 0
- #endif
- 
--/* path handling portability macros */
-+#ifdef _MSC_VER
-+# define S_IXUSR _S_IEXEC
-+# define stat _stat
-+# ifndef _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#endif
-+
- #ifndef DIR_SEPARATOR
- # define DIR_SEPARATOR '/'
- # define PATH_SEPARATOR ':'
-@@ -3522,6 +3230,10 @@
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
- #endif /* PATH_SEPARATOR_2 */
- 
-+#ifdef __CYGWIN__
-+# define FOPEN_WB "wb"
-+#endif
-+
- #ifndef FOPEN_WB
- # define FOPEN_WB "w"
- #endif
-@@ -3534,13 +3246,22 @@
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
--#if defined(LT_DEBUGWRAPPER)
--static int lt_debug = 1;
-+#undef LTWRAPPER_DEBUGPRINTF
-+#if defined DEBUGWRAPPER
-+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-+static void
-+ltwrapper_debugprintf (const char *fmt, ...)
-+{
-+    va_list args;
-+    va_start (args, fmt);
-+    (void) vfprintf (stderr, fmt, args);
-+    va_end (args);
-+}
- #else
--static int lt_debug = 0;
-+# define LTWRAPPER_DEBUGPRINTF(args)
- #endif
- 
--const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-+const char *program_name = NULL;
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
-@@ -3550,17 +3271,31 @@
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
--void lt_debugprintf (const char *file, int line, const char *fmt, ...);
--void lt_fatal (const char *file, int line, const char *message, ...);
--static const char *nonnull (const char *s);
--static const char *nonempty (const char *s);
-+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);
--char **prepare_spawn (char **argv);
--void lt_dump_script (FILE *f);
-+
-+static const char *script_text_part1 =
-+EOF
-+
-+	    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";
-@@ -3605,10 +3340,24 @@
- 	    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 char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-+
-+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[])
-@@ -3625,13 +3374,10 @@
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
--  newargz = XMALLOC (char *, argc + 1);
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- 
--  /* very simple arg parsing; don't want to rely on getopt
--   * also, copy all non cwrapper options to newargz, except
--   * argz[0], which is handled differently
--   */
--  newargc=0;
-+  /* very simple arg parsing; don't want to rely on getopt */
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3645,57 +3391,25 @@
- 	      esac
- 
- 	    cat <<"EOF"
--	  lt_dump_script (stdout);
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
- 	  return 0;
- 	}
--      if (strcmp (argv[i], debug_opt) == 0)
--	{
--          lt_debug = 1;
--          continue;
--	}
--      if (strcmp (argv[i], ltwrapper_option_prefix) == 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 (__FILE__, __LINE__,
--		    "unrecognized %s option: '%s'",
--                    ltwrapper_option_prefix, argv[i]);
--        }
--      /* otherwise ... */
--      newargz[++newargc] = xstrdup (argv[i]);
-     }
--  newargz[++newargc] = NULL;
--
--EOF
--	    cat <<EOF
--  /* The GNU banner must be the first non-error debug message */
--  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
--EOF
--	    cat <<"EOF"
--  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
--  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
-+  newargz = XMALLOC (char *, argc + 1);
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
--    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
--  lt_debugprintf (__FILE__, __LINE__,
--                  "(main) found exe (before symlink chase) at: %s\n",
--		  tmp_pathspec);
-+    lt_fatal ("Couldn't find %s", argv[0]);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-+			  tmp_pathspec));
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
--  lt_debugprintf (__FILE__, __LINE__,
--                  "(main) found exe (after symlink chase) at: %s\n",
--		  actual_cwrapper_path);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-   XFREE (tmp_pathspec);
- 
--  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-@@ -3713,9 +3427,8 @@
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(main) libtool target name: %s\n",
--		  target_name);
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
- EOF
- 
- 	    cat <<EOF
-@@ -3768,12 +3481,77 @@
-   lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- 
--  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
--		  nonnull (lt_argv_zero));
-+  newargc=0;
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+        {
-+          if (argv[i][env_set_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_set_opt_len + 1;
-+              lt_opt_process_env_set (p);
-+            }
-+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_set (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_set_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+        {
-+          if (argv[i][env_prepend_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_prepend_opt_len + 1;
-+              lt_opt_process_env_prepend (p);
-+            }
-+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_prepend_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+        {
-+          if (argv[i][env_append_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_append_opt_len + 1;
-+              lt_opt_process_env_append (p);
-+            }
-+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_append (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_append_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-+    }
-+  newargz[++newargc] = NULL;
-+
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-   for (i = 0; i < newargc; i++)
-     {
--      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
--		      i, nonnull (newargz[i]));
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-     }
- 
- EOF
-@@ -3782,14 +3560,11 @@
- 	      mingw*)
- 		cat <<"EOF"
-   /* execv doesn't actually work on mingw as expected on unix */
--  newargz = prepare_spawn (newargz);
-   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-   if (rval == -1)
-     {
-       /* failed to start process */
--      lt_debugprintf (__FILE__, __LINE__,
--		      "(main) failed to launch target \"%s\": %s\n",
--		      lt_argv_zero, nonnull (strerror (errno)));
-+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-       return 127;
-     }
-   return rval;
-@@ -3811,7 +3586,7 @@
- {
-   void *p = (void *) malloc (num);
-   if (!p)
--    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-+    lt_fatal ("Memory exhausted");
- 
-   return p;
- }
-@@ -3845,8 +3620,8 @@
- {
-   struct stat st;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
--                  nonempty (path));
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3863,8 +3638,8 @@
-   int rval = 0;
-   struct stat st;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
--                  nonempty (path));
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3890,8 +3665,8 @@
-   int tmp_len;
-   char *concat_name;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
--                  nonempty (wrapper));
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
-@@ -3944,8 +3719,7 @@
- 		{
- 		  /* empty path: current directory */
- 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
--		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
--                              nonnull (strerror (errno)));
-+		    lt_fatal ("getcwd failed");
- 		  tmp_len = strlen (tmp);
- 		  concat_name =
- 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3970,8 +3744,7 @@
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
--              nonnull (strerror (errno)));
-+    lt_fatal ("getcwd failed");
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-@@ -3997,9 +3770,8 @@
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
--      lt_debugprintf (__FILE__, __LINE__,
--		      "checking path component for symlinks: %s\n",
--		      tmp_pathspec);
-+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-+			      tmp_pathspec));
-       if (lstat (tmp_pathspec, &s) == 0)
- 	{
- 	  if (S_ISLNK (s.st_mode) != 0)
-@@ -4021,9 +3793,8 @@
- 	}
-       else
- 	{
--	  lt_fatal (__FILE__, __LINE__,
--		    "error accessing file \"%s\": %s",
--		    tmp_pathspec, nonnull (strerror (errno)));
-+	  char *errstr = strerror (errno);
-+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
- 	}
-     }
-   XFREE (tmp_pathspec);
-@@ -4036,8 +3807,7 @@
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
--      lt_fatal (__FILE__, __LINE__,
--		"could not follow symlinks for %s", pathspec);
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
-@@ -4063,25 +3833,11 @@
-   return str;
- }
- 
--void
--lt_debugprintf (const char *file, int line, const char *fmt, ...)
--{
--  va_list args;
--  if (lt_debug)
--    {
--      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
--      va_start (args, fmt);
--      (void) vfprintf (stderr, fmt, args);
--      va_end (args);
--    }
--}
--
- static void
--lt_error_core (int exit_status, const char *file,
--	       int line, const char *mode,
-+lt_error_core (int exit_status, const char *mode,
- 	       const char *message, va_list ap)
- {
--  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-@@ -4090,32 +3846,20 @@
- }
- 
- void
--lt_fatal (const char *file, int line, const char *message, ...)
-+lt_fatal (const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-   va_end (ap);
- }
- 
--static const char *
--nonnull (const char *s)
--{
--  return s ? s : "(null)";
--}
--
--static const char *
--nonempty (const char *s)
--{
--  return (s && !*s) ? "(empty)" : nonnull (s);
--}
--
- void
- lt_setenv (const char *name, const char *value)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_setenv) setting '%s' to '%s'\n",
--                  nonnull (name), nonnull (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 */
-@@ -4160,12 +3904,95 @@
-   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)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
--                  nonnull (name), nonnull (value));
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4184,9 +4011,9 @@
- void
- lt_update_lib_path (const char *name, const char *value)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
--                  nonnull (name), nonnull (value));
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4196,152 +4023,11 @@
-     }
- }
- 
--EOF
--	    case $host_os in
--	      mingw*)
--		cat <<"EOF"
--
--/* Prepares an argument vector before calling spawn().
--   Note that spawn() does not by itself call the command interpreter
--     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
--      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
--         GetVersionEx(&v);
--         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
--      }) ? "cmd.exe" : "command.com").
--   Instead it simply concatenates the arguments, separated by ' ', and calls
--   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
--   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
--   special way:
--   - Space and tab are interpreted as delimiters. They are not treated as
--     delimiters if they are surrounded by double quotes: "...".
--   - Unescaped double quotes are removed from the input. Their only effect is
--     that within double quotes, space and tab are treated like normal
--     characters.
--   - Backslashes not followed by double quotes are not special.
--   - But 2*n+1 backslashes followed by a double quote become
--     n backslashes followed by a double quote (n >= 0):
--       \" -> "
--       \\\" -> \"
--       \\\\\" -> \\"
-- */
--#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
--#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
--char **
--prepare_spawn (char **argv)
--{
--  size_t argc;
--  char **new_argv;
--  size_t i;
--
--  /* Count number of arguments.  */
--  for (argc = 0; argv[argc] != NULL; argc++)
--    ;
--
--  /* Allocate new argument vector.  */
--  new_argv = XMALLOC (char *, argc + 1);
--
--  /* Put quoted arguments into the new argument vector.  */
--  for (i = 0; i < argc; i++)
--    {
--      const char *string = argv[i];
--
--      if (string[0] == '\0')
--	new_argv[i] = xstrdup ("\"\"");
--      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
--	{
--	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
--	  size_t length;
--	  unsigned int backslashes;
--	  const char *s;
--	  char *quoted_string;
--	  char *p;
--
--	  length = 0;
--	  backslashes = 0;
--	  if (quote_around)
--	    length++;
--	  for (s = string; *s != '\0'; s++)
--	    {
--	      char c = *s;
--	      if (c == '"')
--		length += backslashes + 1;
--	      length++;
--	      if (c == '\\')
--		backslashes++;
--	      else
--		backslashes = 0;
--	    }
--	  if (quote_around)
--	    length += backslashes + 1;
--
--	  quoted_string = XMALLOC (char, length + 1);
--
--	  p = quoted_string;
--	  backslashes = 0;
--	  if (quote_around)
--	    *p++ = '"';
--	  for (s = string; *s != '\0'; s++)
--	    {
--	      char c = *s;
--	      if (c == '"')
--		{
--		  unsigned int j;
--		  for (j = backslashes + 1; j > 0; j--)
--		    *p++ = '\\';
--		}
--	      *p++ = c;
--	      if (c == '\\')
--		backslashes++;
--	      else
--		backslashes = 0;
--	    }
--	  if (quote_around)
--	    {
--	      unsigned int j;
--	      for (j = backslashes; j > 0; j--)
--		*p++ = '\\';
--	      *p++ = '"';
--	    }
--	  *p = '\0';
--
--	  new_argv[i] = quoted_string;
--	}
--      else
--	new_argv[i] = (char *) string;
--    }
--  new_argv[argc] = NULL;
--
--  return new_argv;
--}
--EOF
--		;;
--	    esac
--
--            cat <<"EOF"
--void lt_dump_script (FILE* f)
--{
--EOF
--	    func_emit_wrapper yes |
--              $SED -e 's/\([\\"]\)/\\\1/g' \
--	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
- 
--            cat <<"EOF"
--}
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
--# func_win32_import_lib_p ARG
--# True if ARG is an import lib, as indicated by $file_magic_cmd
--func_win32_import_lib_p ()
--{
--    $opt_debug
--    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
--    *import*) : ;;
--    *) false ;;
--    esac
--}
--
- # func_mode_link arg...
- func_mode_link ()
- {
-@@ -4386,7 +4072,6 @@
-     new_inherited_linker_flags=
- 
-     avoid_version=no
--    bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-@@ -4479,11 +4164,6 @@
- 	esac
- 
- 	case $prev in
--	bindir)
--	  bindir="$arg"
--	  prev=
--	  continue
--	  ;;
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
-@@ -4745,11 +4425,6 @@
- 	continue
- 	;;
- 
--      -bindir)
--	prev=bindir
--	continue
--	;;
--
-       -dlopen)
- 	prev=dlfiles
- 	continue
-@@ -4828,7 +4503,7 @@
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
--	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  ::) dllsearchpath=$dir;;
-@@ -4847,7 +4522,7 @@
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -5033,7 +4708,7 @@
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  arg="$arg $func_quote_for_eval_result"
-+	  arg="$arg $wl$func_quote_for_eval_result"
- 	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
-@@ -5079,19 +4754,18 @@
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
--      # Flags to be passed through unchanged, with rationale:
--      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
--      # -r[0-9][0-9]*        specify processor for the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
--      # +DA*, +DD*           enable 64-bit mode for the HP compiler
--      # -q*                  compiler args for the IBM compiler
--      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
--      # -F/path              path to uninstalled frameworks, gcc on darwin
--      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
--      # @file                GCC response files
--      # -tp=*                Portland pgcc target processor selection
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -F/path gives path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+      # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-@@ -5251,7 +4925,7 @@
- 
-     if test -n "$shlibpath_var"; then
-       # get the directories listed in $shlibpath_var
--      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-     else
-       shlib_search_path=
-     fi
-@@ -5359,7 +5033,10 @@
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5374,8 +5051,7 @@
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
--	    func_basename "$deplib"
--            deplib_base=$func_basename_result
-+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
- 	    case " $weak_libs " in
- 	    *" $deplib_base "*) ;;
- 	    *) deplibs="$deplibs $deplib" ;;
-@@ -5554,7 +5230,7 @@
- 		match_pattern*)
- 		  set dummy $deplibs_check_method; shift
- 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
--		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
- 		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=yes
- 		  fi
-@@ -5564,15 +5240,15 @@
- 		;;
- 	      esac
- 	      if test "$valid_a_lib" != yes; then
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because the file extensions .$libext of this argument makes me believe"
--		echo "*** that it is just a static archive that I should not use here."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-+		$ECHO "*** that it is just a static archive that I should not use here."
- 	      else
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
-@@ -5645,7 +5321,7 @@
- 
- 	# Convert "-framework foo" to "foo.ltframework"
- 	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
- 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- 	    case " $new_inherited_linker_flags " in
- 	      *" $tmp_inherited_linker_flag "*) ;;
-@@ -5653,7 +5329,7 @@
- 	    esac
- 	  done
- 	fi
--	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5671,19 +5347,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"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    deplibs="$deplib $deplibs"
--	    if $opt_duplicate_deps ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--	    fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5907,7 +5583,7 @@
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
--	    echo
-+	    $ECHO
- 	    if test "$linkmode" = prog; then
- 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
- 	    else
-@@ -6010,9 +5686,9 @@
- 		      if test "X$dlopenmodule" != "X$lib"; then
- 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library" ; then
--			  echo
--			  echo "*** And there doesn't seem to be a static archive available"
--			  echo "*** The link will probably fail, sorry"
-+			  $ECHO
-+			  $ECHO "*** And there doesn't seem to be a static archive available"
-+			  $ECHO "*** The link will probably fail, sorry"
- 			else
- 			  add="$dir/$old_library"
- 			fi
-@@ -6152,21 +5828,21 @@
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
--	    echo
-+	    $ECHO
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
--	    echo "*** I have the capability to make that library automatically link in when"
--	    echo "*** you link to this library.  But I can only do this if you have a"
--	    echo "*** shared version of the library, which you do not appear to have."
-+	    $ECHO "*** I have the capability to make that library automatically link in when"
-+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+	    $ECHO "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
--	      echo "*** But as you try to build a module library, libtool will still create "
--	      echo "*** a static module, that should work as long as the dlopening application"
--	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      $ECHO "*** But as you try to build a module library, libtool will still create "
-+	      $ECHO "*** a static module, that should work as long as the dlopening application"
-+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
--		echo
--		echo "*** However, this would only work if libtool was able to extract symbol"
--		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--		echo "*** not find such a program.  So, this module is probably useless."
--		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+		$ECHO
-+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		$ECHO "*** not find such a program.  So, this module is probably useless."
-+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
-@@ -6286,7 +5962,7 @@
- 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- 	else
--	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	fi
-       fi
-       dependency_libs="$newdependency_libs"
-@@ -6454,7 +6130,7 @@
- 	if test "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
- 	else
--	  echo
-+	  $ECHO
- 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- 	  $ECHO "*** objects $objs is not portable!"
- 	  libobjs="$libobjs $objs"
-@@ -6522,7 +6198,7 @@
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|qnx|sunos)
-+	  freebsd-aout|freebsd-elf|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -6534,6 +6210,9 @@
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
-@@ -6756,14 +6435,14 @@
- 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
--	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-       fi
- 
-       # Eliminate all temporary directories.
-       #for path in $notinst_path; do
--      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
--      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
--      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-       #done
- 
-       if test -n "$xrpath"; then
-@@ -6804,7 +6483,7 @@
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -6889,13 +6568,13 @@
- 		    newdeplibs="$newdeplibs $i"
- 		  else
- 		    droppeddeps=yes
--		    echo
-+		    $ECHO
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		    echo "*** I have the capability to make that library automatically link in when"
--		    echo "*** you link to this library.  But I can only do this if you have a"
--		    echo "*** shared version of the library, which I believe you do not have"
--		    echo "*** because a test_compile did reveal that the linker did not use it for"
--		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+		    $ECHO "*** I have the capability to make that library automatically link in when"
-+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		    $ECHO "*** shared version of the library, which I believe you do not have"
-+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
- 		;;
-@@ -6932,22 +6611,22 @@
- 		      newdeplibs="$newdeplibs $i"
- 		    else
- 		      droppeddeps=yes
--		      echo
-+		      $ECHO
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		      echo "*** I have the capability to make that library automatically link in when"
--		      echo "*** you link to this library.  But I can only do this if you have a"
--		      echo "*** shared version of the library, which you do not appear to have"
--		      echo "*** because a test_compile did reveal that the linker did not use this one"
--		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		      $ECHO "*** I have the capability to make that library automatically link in when"
-+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		      $ECHO "*** shared version of the library, which you do not appear to have"
-+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  echo
-+		  $ECHO
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
--		  echo "*** make it link in!  You will probably need to install it or some"
--		  echo "*** library that it depends on before this library will be fully"
--		  echo "*** functional.  Installing it before continuing would be even better."
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
- 		fi
- 		;;
- 	      *)
-@@ -6993,7 +6672,7 @@
- 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
--			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-@@ -7008,12 +6687,12 @@
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because I did check the linker path looking for a file starting"
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
- 		else
-@@ -7051,7 +6730,7 @@
- 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		    potlib="$potent_lib" # see symlink-check above in file_magic test
--		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
- 		       $EGREP "$match_pattern_regex" > /dev/null; then
- 		      newdeplibs="$newdeplibs $a_deplib"
- 		      a_deplib=""
-@@ -7062,12 +6741,12 @@
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because I did check the linker path looking for a file starting"
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
- 		else
-@@ -7085,25 +6764,25 @@
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
--	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
- 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
- 	      # can't use Xsed below, because $i might contain '/'
--	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
- 	    done
- 	  fi
--	  case $tmp_deplibs in
--	  *[!\	\ ]*)
--	    echo
-+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-+	     $GREP . >/dev/null; then
-+	    $ECHO
- 	    if test "X$deplibs_check_method" = "Xnone"; then
--	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
--	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
--	    echo "*** All declared inter-library dependencies are being dropped."
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
--	    ;;
--	  esac
-+	  fi
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
-@@ -7115,23 +6794,23 @@
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library with the System framework
--	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- 	  ;;
- 	esac
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
--	    echo
--	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    $ECHO
-+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
- 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
--	    echo "*** a static module, that should work as long as the dlopening"
--	    echo "*** application is linked with the -dlopen flag."
-+	    $ECHO "*** a static module, that should work as long as the dlopening"
-+	    $ECHO "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
--	      echo
--	      echo "*** However, this would only work if libtool was able to extract symbol"
--	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--	      echo "*** not find such a program.  So, this module is probably useless."
--	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      $ECHO
-+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      $ECHO "*** not find such a program.  So, this module is probably useless."
-+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
-@@ -7141,16 +6820,16 @@
- 	      build_libtool_libs=no
- 	    fi
- 	  else
--	    echo "*** The inter-library dependencies that have been dropped here will be"
--	    echo "*** automatically added whenever a program is linked with this library"
--	    echo "*** or is declared to -dlopen it."
-+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-+	    $ECHO "*** automatically added whenever a program is linked with this library"
-+	    $ECHO "*** or is declared to -dlopen it."
- 
- 	    if test "$allow_undefined" = no; then
--	      echo
--	      echo "*** Since this library must not contain undefined symbols,"
--	      echo "*** because either the platform does not support them or"
--	      echo "*** it was explicitly requested with -no-undefined,"
--	      echo "*** libtool will only create a static version of it."
-+	      $ECHO
-+	      $ECHO "*** Since this library must not contain undefined symbols,"
-+	      $ECHO "*** because either the platform does not support them or"
-+	      $ECHO "*** it was explicitly requested with -no-undefined,"
-+	      $ECHO "*** libtool will only create a static version of it."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
-@@ -7167,9 +6846,9 @@
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       case $host in
- 	*-*-darwin*)
--	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  ;;
-       esac
- 
-@@ -7291,7 +6970,7 @@
- 	done
- 
- 	# Use standard objects if they are pic
--	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 	test "X$libobjs" = "X " && libobjs=
- 
- 	delfiles=
-@@ -7357,7 +7036,7 @@
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols="$export_symbols"
- 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
- 	fi
- 
- 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7458,8 +7137,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
--	  func_basename "$output"
--	  output_la=$func_basename_result
-+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -7472,12 +7150,12 @@
- 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
- 	    func_verbose "creating GNU ld script: $output"
--	    echo 'INPUT (' > $output
-+	    $ECHO 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
- 	      $ECHO "$obj" >> $output
- 	    done
--	    echo ')' >> $output
-+	    $ECHO ')' >> $output
- 	    delfiles="$delfiles $output"
- 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
-@@ -7519,19 +7197,17 @@
- 		  # command to the queue.
- 		  if test "$k" -eq 1 ; then
- 		    # The first file doesn't have a previous command to add.
--		    reload_objs=$objlist
--		    eval concat_cmds=\"$reload_cmds\"
-+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
- 		  else
- 		    # All subsequent reloadable object files will link in
- 		    # the last one created.
--		    reload_objs="$objlist $last_robj"
--		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
- 		  fi
- 		  last_robj=$output_objdir/$output_la-${k}.$objext
- 		  func_arith $k + 1
- 		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-${k}.$objext
--		  objlist=" $obj"
-+		  objlist=$obj
- 		  func_len " $last_robj"
- 		  func_arith $len0 + $func_len_result
- 		  len=$func_arith_result
-@@ -7541,8 +7217,7 @@
- 	      # reloadable object file.  All subsequent reloadable object
- 	      # files will link in the last one created.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--	      reload_objs="$objlist $last_robj"
--	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
- 	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- 	      fi
-@@ -7601,7 +7276,7 @@
- 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols="$export_symbols"
- 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
- 	    fi
- 
- 	    if test -n "$orig_export_symbols"; then
-@@ -7766,7 +7441,7 @@
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
- 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
--	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- 	else
- 	  gentop="$output_objdir/${obj}x"
- 	  generated="$generated $gentop"
-@@ -7777,7 +7452,7 @@
-       fi
- 
-       # Create the old-style object.
--      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7837,8 +7512,8 @@
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
--	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- 	;;
-       esac
- 
-@@ -7855,8 +7530,8 @@
- 	  esac
- 	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	;;
-       esac
- 
-@@ -7993,8 +7668,8 @@
- 
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
--	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
--	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-       fi
- 
-       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -8006,15 +7681,15 @@
- 
-       wrappers_required=yes
-       case $host in
--      *cegcc* | *mingw32ce*)
--        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
--        wrappers_required=no
--        ;;
-       *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
-+      *cegcc)
-+        # Disable wrappers for cegcc, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-       *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-@@ -8023,7 +7698,7 @@
-       esac
-       if test "$wrappers_required" = no; then
- 	# Replace the output file specification.
--	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
- 
- 	# We have no uninstalled library dependencies, so finalize right now.
-@@ -8070,7 +7745,7 @@
- 	# We don't need to create a wrapper script.
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	# Replace the output file specification.
--	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 	# Delete the old output file.
- 	$opt_dry_run || $RM $output
- 	# Link the executable and exit
-@@ -8089,7 +7764,7 @@
- 	if test "$fast_install" != no; then
- 	  link_command="$finalize_var$compile_command$finalize_rpath"
- 	  if test "$fast_install" = yes; then
--	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
- 	  else
- 	    # fast_install is set to needless
- 	    relink_command=
-@@ -8101,7 +7776,7 @@
-       fi
- 
-       # Replace the output file specification.
--      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
-       # Delete the old output files.
-       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-@@ -8125,7 +7800,18 @@
- 	  fi
- 	done
- 	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $ECHO for shipping.
-+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-+	esac
-+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -8246,7 +7932,7 @@
- 	    done | sort | sort -uc >/dev/null 2>&1); then
- 	  :
- 	else
--	  echo "copying selected object files to avoid basename conflicts..."
-+	  $ECHO "copying selected object files to avoid basename conflicts..."
- 	  gentop="$output_objdir/${outputname}x"
- 	  generated="$generated $gentop"
- 	  func_mkdir_p "$gentop"
-@@ -8357,7 +8043,7 @@
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
- 	relink_command=
-       fi
-@@ -8442,27 +8128,9 @@
- 	  fi
- 	  $RM $output
- 	  # place dlname in correct position for cygwin
--	  # In fact, it would be nice if we could use this code for all target
--	  # systems that can't hard-code library paths into their executables
--	  # and that have no shared library path variable independent of PATH,
--	  # but it turns out we can't easily determine that from inspecting
--	  # libtool variables, so we have to hard-code the OSs to which it
--	  # applies here; at the moment, that means platforms that use the PE
--	  # object format with DLL files.  See the long comment at the top of
--	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
--	      # If a -bindir argument was supplied, place the dll there.
--	      if test "x$bindir" != x ;
--	      then
--		func_relative_path "$install_libdir" "$bindir"
--		tdlname=$func_relative_path_result$dlname
--	      else
--		# Otherwise fall back on heuristic.
--		tdlname=../bin/$dlname
--	      fi
--	      ;;
-+	    *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: cairo/build/ltoptions.m4
-===================================================================
---- cairo.orig/build/ltoptions.m4	2010-09-06 23:50:27.351409900 +0200
-+++ cairo/build/ltoptions.m4	2010-09-06 23:49:58.895407457 +0200
-@@ -1,14 +1,13 @@
- # Helper functions for option handling.                    -*- Autoconf -*-
- #
--#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
--#   Inc.
-+#   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 7 ltoptions.m4
-+# serial 6 ltoptions.m4
- 
- # This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -126,7 +125,7 @@
- [enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -134,13 +133,13 @@
- esac
- 
- test -z "$AS" && AS=as
--_LT_DECL([], [AS],      [1], [Assembler program])dnl
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
- 
- test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
- 
- test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
- ])# win32-dll
- 
- AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-Index: cairo/build/ltversion.m4
-===================================================================
---- cairo.orig/build/ltversion.m4	2010-09-06 23:50:27.271419773 +0200
-+++ cairo/build/ltversion.m4	2010-09-06 23:49:59.115419713 +0200
-@@ -9,15 +9,15 @@
- 
- # Generated from ltversion.in.
- 
--# serial 3175 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.10])
--m4_define([LT_PACKAGE_REVISION], [1.3175])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.10'
--macro_revision='1.3175'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-Index: cairo/build/lt~obsolete.m4
-===================================================================
---- cairo.orig/build/lt~obsolete.m4	2010-09-06 23:50:27.067408869 +0200
-+++ cairo/build/lt~obsolete.m4	2010-09-06 23:49:59.215407203 +0200
-@@ -1,13 +1,13 @@
- # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
- #
--#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
- #   Written by Scott James Remnant, 2004.
- #
- # This file is free software; the Free Software Foundation gives
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# serial 5 lt~obsolete.m4
-+# serial 4 lt~obsolete.m4
- 
- # These exist entirely to fool aclocal when bootstrapping libtool.
- #
-@@ -77,6 +77,7 @@
- m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
- m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
- m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
- m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
- m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
- m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -89,10 +90,3 @@
- m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
- m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
- m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
--m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
--m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
--m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
--m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
--m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
--m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
--m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
-Index: cairo/doc/Makefile.in
-===================================================================
---- cairo.orig/doc/Makefile.in	2010-09-06 23:50:28.727420324 +0200
-+++ cairo/doc/Makefile.in	2010-09-06 23:50:07.384405715 +0200
-@@ -198,6 +198,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -287,6 +288,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -340,7 +342,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -365,9 +367,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
-Index: cairo/doc/public/Makefile.in
-===================================================================
---- cairo.orig/doc/public/Makefile.in	2010-09-06 23:50:28.679433780 +0200
-+++ cairo/doc/public/Makefile.in	2010-09-06 23:50:07.492406112 +0200
-@@ -15,59 +15,6 @@
- 
- @SET_MAKE@
- 
--# Generated by configure.  Do not edit.
--
--# Makefile.sources
--#
--# This file is the canonical location listing all the source files used
--# to build the cairo library.  Every source file is categorized as one of:
--#
--#   * public header file
--#   * private header file (must end in -private.h except for cairoint.h)
--#   * source code file
--#
--# Every source file should be specified exactly once, grouped with the
--# feature that uses the source file.  If more than one feature use the
--# file (like pdf_operators or font_subset files), the files should be
--# appended to to the base cairo files, and the code inside them
--# enabled/disabled using C preprocessor macros defined in cairoint.h.
--# See how pdf_operators or font_subset are handled.
--#
--# The sources are picked up according to the configured features
--# by the generated file Makefile.am.features or Makefile.win32.features.
--#
--# These are a few special source files.  Those are not included in this
--# file to not confuse build systems.  Each build system must handle them
--# separately.  These files include:
--#
--#   * cairo-features.h:
--#     This file is generated by configure and includes macros signifying
--#     which features are enabled.  This file should be installed like
--#     other public headers, but should NOT be distributed in the cairo
--#     distribution.
--#
--#   * cairo-version.h:
--#     This is a dummy header file used during the build, but it should
--#     NOT be installed.  Its sole purpose is to make sure changes in the
--#     cairo version do not trigger a full rebuild of the library, but
--#     just the functions actually using the version information.
--#
--#   * $(top_srcdir)/cairo-version.h:
--#     This is the real file holding the cairo version number.  This file
--#     should be installed like other public headers.  This is used during
--#     the build by cairo-version.c only.
--#
--#   * cairo-supported-features.h:
--#     This file is generated by configure and includes macros signifying
--#     all supported features.  This is used by gtk-doc to generate
--#     documentation for all those macros, enabled or not.
--#     This file is NOT used during the build of the library and should
--#     NOT be installed or distributed.
--#
--# Please follow the strict syntax of this file, including keeping file
--# lists sorted.
--#
--
- # Modified for cairo minimally:
- #   - Moved to build/
- #   - Made it append to EXTRA_DIST and CLEANFILES
-@@ -100,202 +47,10 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/build/Makefile.am.common \
- 	$(top_srcdir)/build/Makefile.am.gtk-doc \
--	$(top_srcdir)/src/Makefile.am.features \
--	$(top_srcdir)/src/Makefile.sources
-+	$(top_srcdir)/src/Makefile.am.features
- EXTRA_PROGRAMS =
- check_PROGRAMS =
--@BUILD_XCB_SHM_TRUE@am__append_1 = \
--@BUILD_XCB_SHM_TRUE@		    cairo-xcb-shm.c \
--@BUILD_XCB_SHM_TRUE@		    cairo-xcb-connection-shm.c \
--@BUILD_XCB_SHM_TRUE@		    $(NULL)
--
--@BUILD_PRIVATE_GLEW_TRUE@am__append_2 = glew/glew.c
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_3 = $(cairo_xlib_headers)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_4 = $(cairo_xlib_private)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_5 = $(cairo_xlib_cxx_sources)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_6 = $(cairo_xlib_sources)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_7 = cairo-xlib.pc
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_8 = $(cairo_xlib_xrender_headers)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_9 = $(cairo_xlib_xrender_private)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_10 = $(cairo_xlib_xrender_cxx_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_11 = $(cairo_xlib_xrender_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_12 = cairo-xlib-xrender.pc
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_13 = $(cairo_xcb_headers)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_14 = $(cairo_xcb_private)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_15 = $(cairo_xcb_cxx_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_16 = $(cairo_xcb_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_17 = cairo-xcb.pc
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_18 = $(cairo_xlib_xcb_headers)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_19 = $(cairo_xlib_xcb_private)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_20 = $(cairo_xlib_xcb_cxx_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_21 = $(cairo_xlib_xcb_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_22 = cairo-xlib-xcb.pc
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_23 = $(cairo_xcb_shm_headers)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_24 = $(cairo_xcb_shm_private)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_25 = $(cairo_xcb_shm_cxx_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_26 = $(cairo_xcb_shm_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_27 = cairo-xcb-shm.pc
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_28 = $(cairo_qt_headers)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_29 = $(cairo_qt_private)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_30 = $(cairo_qt_cxx_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_31 = $(cairo_qt_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_32 = cairo-qt.pc
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_33 = $(cairo_quartz_headers)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_34 = $(cairo_quartz_private)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_35 = $(cairo_quartz_cxx_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_36 = $(cairo_quartz_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_37 = cairo-quartz.pc
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_38 = $(cairo_quartz_font_headers)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_39 = $(cairo_quartz_font_private)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_40 = $(cairo_quartz_font_cxx_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_41 = $(cairo_quartz_font_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_42 = cairo-quartz-font.pc
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_43 = $(cairo_quartz_image_headers)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_44 = $(cairo_quartz_image_private)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_45 = $(cairo_quartz_image_cxx_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_46 = $(cairo_quartz_image_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_47 = cairo-quartz-image.pc
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_48 = $(cairo_win32_headers)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_49 = $(cairo_win32_private)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_50 = $(cairo_win32_cxx_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_51 = $(cairo_win32_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_52 = cairo-win32.pc
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_53 = $(cairo_win32_font_headers)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_54 = $(cairo_win32_font_private)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_55 = $(cairo_win32_font_cxx_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_56 = $(cairo_win32_font_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_57 = cairo-win32-font.pc
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_58 = $(cairo_skia_headers)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_59 = $(cairo_skia_private)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_60 = $(cairo_skia_cxx_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_61 = $(cairo_skia_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_62 = cairo-skia.pc
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_63 = $(cairo_os2_headers)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_64 = $(cairo_os2_private)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_65 = $(cairo_os2_cxx_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_66 = $(cairo_os2_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_67 = cairo-os2.pc
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_68 = $(cairo_beos_headers)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_69 = $(cairo_beos_private)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_70 = $(cairo_beos_cxx_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_71 = $(cairo_beos_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_72 = cairo-beos.pc
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_73 = $(cairo_drm_headers)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_74 = $(cairo_drm_private)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_75 = $(cairo_drm_cxx_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_76 = $(cairo_drm_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_77 = cairo-drm.pc
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_78 = $(cairo_drm_xr_headers)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_79 = $(cairo_drm_xr_private)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_80 = $(cairo_drm_xr_cxx_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_81 = $(cairo_drm_xr_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_82 = cairo-drm-xr.pc
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_83 = $(cairo_gallium_headers)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_84 = $(cairo_gallium_private)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_85 = $(cairo_gallium_cxx_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_86 = $(cairo_gallium_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_87 = cairo-gallium.pc
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_88 = $(cairo_xcb_drm_headers)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_89 = $(cairo_xcb_drm_private)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_90 = $(cairo_xcb_drm_cxx_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_91 = $(cairo_xcb_drm_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_92 = cairo-xcb-drm.pc
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_93 = $(cairo_png_headers)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_94 = $(cairo_png_private)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_95 = $(cairo_png_cxx_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_96 = $(cairo_png_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_97 = cairo-png.pc
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_98 = $(cairo_gl_headers)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_99 = $(cairo_gl_private)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_100 = $(cairo_gl_cxx_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_101 = $(cairo_gl_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_102 = cairo-gl.pc
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_103 = $(cairo_directfb_headers)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_104 = $(cairo_directfb_private)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_105 = $(cairo_directfb_cxx_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_106 = $(cairo_directfb_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_107 = cairo-directfb.pc
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_108 = $(cairo_vg_headers)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_109 = $(cairo_vg_private)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_110 = $(cairo_vg_cxx_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_111 = $(cairo_vg_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_112 = cairo-vg.pc
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_113 = $(cairo_egl_headers)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_114 = $(cairo_egl_private)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_115 = $(cairo_egl_cxx_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_116 = $(cairo_egl_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_117 = cairo-egl.pc
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_118 = $(cairo_glx_headers)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_119 = $(cairo_glx_private)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_120 = $(cairo_glx_cxx_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_121 = $(cairo_glx_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_122 = cairo-glx.pc
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_123 = $(cairo_wgl_headers)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_124 = $(cairo_wgl_private)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_125 = $(cairo_wgl_cxx_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_126 = $(cairo_wgl_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_127 = cairo-wgl.pc
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_128 = $(cairo_script_headers)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_129 = $(cairo_script_private)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_130 = $(cairo_script_cxx_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_131 = $(cairo_script_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_132 = cairo-script.pc
--@CAIRO_HAS_FT_FONT_TRUE@am__append_133 = $(cairo_ft_headers)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_134 = $(cairo_ft_private)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_135 = $(cairo_ft_cxx_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_136 = $(cairo_ft_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_137 = cairo-ft.pc
--@CAIRO_HAS_FC_FONT_TRUE@am__append_138 = $(cairo_fc_headers)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_139 = $(cairo_fc_private)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_140 = $(cairo_fc_cxx_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_141 = $(cairo_fc_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_142 = cairo-fc.pc
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_143 = $(cairo_ps_headers)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_144 = $(cairo_ps_private)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_145 = $(cairo_ps_cxx_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_146 = $(cairo_ps_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_147 = cairo-ps.pc
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_148 = $(cairo_pdf_headers)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_149 = $(cairo_pdf_private)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_150 = $(cairo_pdf_cxx_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_151 = $(cairo_pdf_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_152 = cairo-pdf.pc
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_153 = $(cairo_svg_headers)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_154 = $(cairo_svg_private)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_155 = $(cairo_svg_cxx_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_156 = $(cairo_svg_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_157 = cairo-svg.pc
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_158 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_159 = $(cairo_test_surfaces_cxx_sources)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_160 = $(cairo_test_surfaces_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_161 = $(cairo_tee_headers)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_162 = $(cairo_tee_private)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_163 = $(cairo_tee_cxx_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_164 = $(cairo_tee_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_165 = cairo-tee.pc
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_166 = $(cairo_xml_headers)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_167 = $(cairo_xml_private)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_168 = $(cairo_xml_cxx_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_169 = $(cairo_xml_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_170 = cairo-xml.pc
--@CAIRO_HAS_PTHREAD_TRUE@am__append_171 = $(cairo_pthread_private) $(cairo_pthread_headers)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_172 = $(cairo_pthread_cxx_sources)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_173 = $(cairo_pthread_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_174 = $(cairo_gobject_headers)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_175 = $(cairo_gobject_private)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_176 = $(cairo_gobject_cxx_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_177 = $(cairo_gobject_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_178 = cairo-gobject.pc
--@CAIRO_HAS_TRACE_TRUE@am__append_179 = $(cairo_trace_private) $(cairo_trace_headers)
--@CAIRO_HAS_TRACE_TRUE@am__append_180 = $(cairo_trace_cxx_sources)
--@CAIRO_HAS_TRACE_TRUE@am__append_181 = $(cairo_trace_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_182 = $(cairo_interpreter_private) $(cairo_interpreter_headers)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_183 = $(cairo_interpreter_cxx_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_184 = $(cairo_interpreter_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_185 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_186 = $(cairo_symbol_lookup_cxx_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_187 = $(cairo_symbol_lookup_sources)
--@ENABLE_GTK_DOC_TRUE@am__append_188 = check-doc-coverage.sh
-+@ENABLE_GTK_DOC_TRUE@am__append_1 = check-doc-coverage.sh
- subdir = doc/public
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -416,6 +171,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -505,6 +261,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -556,409 +313,7 @@
- 	check-doc-coverage.sh check-doc-syntax.sh
- EXTRA_LTLIBRARIES = 
- MAINTAINERCLEANFILES = Makefile.in
--TESTS = $(am__append_188) check-doc-syntax.sh
--cairo_headers = cairo.h cairo-deprecated.h
--cairo_private = cairoint.h cairo-analysis-surface-private.h \
--	cairo-arc-private.h cairo-atomic-private.h \
--	cairo-boxes-private.h cairo-cache-private.h \
--	cairo-clip-private.h cairo-combsort-private.h \
--	cairo-compiler-private.h cairo-composite-rectangles-private.h \
--	cairo-device-private.h cairo-error-private.h \
--	cairo-fixed-private.h cairo-fixed-type-private.h \
--	cairo-freelist-private.h cairo-freelist-type-private.h \
--	cairo-freed-pool-private.h cairo-fontconfig-private.h \
--	cairo-gstate-private.h cairo-hash-private.h \
--	cairo-image-info-private.h cairo-list-private.h \
--	cairo-malloc-private.h cairo-recording-surface-private.h \
--	cairo-mutex-impl-private.h cairo-mutex-list-private.h \
--	cairo-mutex-private.h cairo-mutex-type-private.h \
--	cairo-output-stream-private.h cairo-paginated-private.h \
--	cairo-paginated-surface-private.h cairo-path-fixed-private.h \
--	cairo-path-private.h cairo-private.h \
--	cairo-reference-count-private.h cairo-region-private.h \
--	cairo-rtree-private.h cairo-scaled-font-private.h \
--	cairo-slope-private.h cairo-spans-private.h \
--	cairo-surface-fallback-private.h cairo-surface-private.h \
--	cairo-surface-clipper-private.h cairo-surface-offset-private.h \
--	cairo-surface-subsurface-private.h \
--	cairo-surface-snapshot-private.h \
--	cairo-surface-wrapper-private.h cairo-types-private.h \
--	cairo-user-font-private.h cairo-wideint-private.h \
--	cairo-wideint-type-private.h $(NULL) \
--	$(_cairo_font_subset_private) $(_cairo_pdf_operators_private)
--cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \
--	cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \
--	cairo-bentley-ottmann.c cairo-bentley-ottmann-rectangular.c \
--	cairo-bentley-ottmann-rectilinear.c \
--	cairo-botor-scan-converter.c cairo-boxes.c cairo.c \
--	cairo-cache.c cairo-clip.c cairo-color.c \
--	cairo-composite-rectangles.c cairo-debug.c cairo-device.c \
--	cairo-fixed.c cairo-font-face.c cairo-font-face-twin.c \
--	cairo-font-face-twin-data.c cairo-font-options.c \
--	cairo-freelist.c cairo-freed-pool.c cairo-gstate.c \
--	cairo-hash.c cairo-hull.c cairo-image-info.c \
--	cairo-image-surface.c cairo-lzw.c cairo-matrix.c \
--	cairo-recording-surface.c cairo-misc.c cairo-mutex.c \
--	cairo-observer.c cairo-output-stream.c \
--	cairo-paginated-surface.c cairo-path-bounds.c cairo-path.c \
--	cairo-path-fill.c cairo-path-fixed.c cairo-path-in-fill.c \
--	cairo-path-stroke.c cairo-pattern.c cairo-pen.c \
--	cairo-polygon.c cairo-rectangle.c \
--	cairo-rectangular-scan-converter.c cairo-region.c \
--	cairo-rtree.c cairo-scaled-font.c cairo-slope.c cairo-spans.c \
--	cairo-spline.c cairo-stroke-style.c cairo-surface.c \
--	cairo-surface-fallback.c cairo-surface-clipper.c \
--	cairo-surface-offset.c cairo-surface-snapshot.c \
--	cairo-surface-subsurface.c cairo-surface-wrapper.c \
--	cairo-system.c cairo-tor-scan-converter.c \
--	cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \
--	cairo-user-font.c cairo-version.c cairo-wideint.c $(NULL) \
--	$(_cairo_font_subset_sources) $(_cairo_pdf_operators_sources) \
--	$(req_cairo_deflate_stream_sources) $(NULL)
--_cairo_font_subset_private = \
--	cairo-scaled-font-subsets-private.h \
--	cairo-truetype-subset-private.h \
--	cairo-type1-private.h \
--        cairo-type3-glyph-surface-private.h \
--	$(NULL)
--
--_cairo_font_subset_sources = \
--	cairo-cff-subset.c \
--	cairo-scaled-font-subsets.c \
--	cairo-truetype-subset.c \
--	cairo-type1-fallback.c \
--	cairo-type1-subset.c \
--        cairo-type3-glyph-surface.c \
--	$(NULL)
--
--cairo_egl_sources = cairo-egl-context.c
--cairo_glx_sources = cairo-glx-context.c
--cairo_wgl_sources = cairo-wgl-context.c
--_cairo_pdf_operators_private = cairo-pdf-operators-private.h
--_cairo_pdf_operators_sources = cairo-pdf-operators.c
--cairo_png_sources = cairo-png.c
--cairo_ps_headers = cairo-ps.h
--cairo_ps_private = cairo-ps-surface-private.h
--cairo_ps_sources = cairo-ps-surface.c
--cairo_deflate_stream_sources = cairo-deflate-stream.c
--cairo_pdf_headers = cairo-pdf.h
--cairo_pdf_private = cairo-pdf-surface-private.h
--cairo_pdf_sources = cairo-pdf-surface.c
--@CAIRO_HAS_PDF_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--cairo_svg_headers = cairo-svg.h
--cairo_svg_private = cairo-svg-surface-private.h
--cairo_svg_sources = cairo-svg-surface.c
--cairo_ft_headers = cairo-ft.h
--cairo_ft_private = cairo-ft-private.h
--cairo_ft_sources = cairo-ft-font.c
--
--# These are private, even though they look like public headers
--cairo_test_surfaces_private = \
--	test-fallback-surface.h \
--	test-fallback16-surface.h \
--	test-null-surface.h \
--	test-paginated-surface.h \
--	test-wrapping-surface.h \
--	$(NULL)
--
--cairo_test_surfaces_sources = \
--	test-fallback-surface.c \
--	test-fallback16-surface.c \
--	test-null-surface.c \
--	test-paginated-surface.c \
--	test-wrapping-surface.c \
--	$(NULL)
--
--cairo_xlib_headers = cairo-xlib.h
--cairo_xlib_private = \
--	cairo-xlib-private.h \
--	cairo-xlib-surface-private.h \
--	cairo-xlib-xrender-private.h \
--	$(NULL)
--
--@BUILD_XLIB_XCB_FALSE@cairo_xlib_sources = \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-display.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-screen.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-surface.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-visual.c \
--@BUILD_XLIB_XCB_FALSE@	$(NULL)
--
--@BUILD_XLIB_XCB_TRUE@cairo_xlib_sources = cairo-xlib-xcb-surface.c
--cairo_xlib_xrender_headers = cairo-xlib-xrender.h
--cairo_xcb_headers = cairo-xcb.h
--cairo_xcb_private = cairo-xcb-private.h
--cairo_xcb_sources = cairo-xcb-connection.c cairo-xcb-connection-core.c \
--	cairo-xcb-connection-render.c cairo-xcb-screen.c \
--	cairo-xcb-surface.c cairo-xcb-surface-cairo.c \
--	cairo-xcb-surface-core.c cairo-xcb-surface-render.c $(NULL) \
--	$(am__append_1)
--cairo_qt_headers = cairo-qt.h
--cairo_qt_cxx_sources = cairo-qt-surface.cpp
--cairo_quartz_headers = cairo-quartz.h
--cairo_quartz_private = cairo-quartz-private.h
--cairo_quartz_sources = cairo-quartz-surface.c
--cairo_quartz_image_headers = cairo-quartz-image.h
--cairo_quartz_image_sources = cairo-quartz-image-surface.c
--cairo_quartz_font_sources = cairo-quartz-font.c
--cairo_win32_headers = cairo-win32.h
--cairo_win32_private = cairo-win32-private.h
--cairo_win32_sources = cairo-win32-surface.c cairo-win32-printing-surface.c
--cairo_win32_font_sources = cairo-win32-font.c
--cairo_skia_headers = cairo-skia.h
--cairo_skia_cxx_sources = cairo-skia-surface.cpp
--cairo_os2_headers = cairo-os2.h
--cairo_os2_private = cairo-os2-private.h
--cairo_os2_sources = cairo-os2-surface.c
--
--# automake is stupid enough to always use c++ linker if we enable the
--# following lines, even if beos surface is not enabled.  Disable it for now.
--cairo_beos_headers = cairo-beos.h
--cairo_beos_cxx_sources = cairo-beos-surface.cpp
--cairo_gl_headers = cairo-gl.h
--cairo_gl_private = cairo-gl-private.h \
--		   cairo-gl-gradient-private.h \
--		   glew/GL/glew.h \
--		   glew/GL/glxew.h
--
--cairo_gl_sources = cairo-gl-composite.c cairo-gl-device.c \
--	cairo-gl-glyphs.c cairo-gl-gradient.c cairo-gl-shaders.c \
--	cairo-gl-surface.c $(am__append_2)
--cairo_directfb_headers = cairo-directfb.h
--cairo_directfb_sources = cairo-directfb-surface.c
--cairo_drm_headers = cairo-drm.h
--cairo_drm_private = drm/cairo-drm-private.h \
--		    drm/cairo-drm-ioctl-private.h \
--		    drm/cairo-drm-intel-private.h \
--		    drm/cairo-drm-intel-ioctl-private.h \
--		    drm/cairo-drm-i915-private.h \
--		    drm/cairo-drm-i965-private.h \
--		    drm/cairo-drm-intel-brw-defines.h \
--		    drm/cairo-drm-intel-brw-structs.h \
--		    drm/cairo-drm-intel-brw-eu.h \
--		    drm/cairo-drm-radeon-private.h
--
--cairo_drm_sources = drm/cairo-drm.c \
--		    drm/cairo-drm-bo.c \
--		    drm/cairo-drm-surface.c \
--		    drm/cairo-drm-intel.c \
--		    drm/cairo-drm-intel-debug.c \
--		    drm/cairo-drm-intel-surface.c \
--		    drm/cairo-drm-i915-surface.c \
--		    drm/cairo-drm-i915-glyphs.c \
--		    drm/cairo-drm-i915-shader.c \
--		    drm/cairo-drm-i915-spans.c \
--		    drm/cairo-drm-i965-surface.c \
--		    drm/cairo-drm-i965-glyphs.c \
--		    drm/cairo-drm-i965-shader.c \
--		    drm/cairo-drm-i965-spans.c \
--		    drm/cairo-drm-intel-brw-eu.c \
--		    drm/cairo-drm-intel-brw-eu-emit.c \
--		    drm/cairo-drm-intel-brw-eu-util.c \
--		    drm/cairo-drm-radeon.c \
--		    drm/cairo-drm-radeon-surface.c
--
--cairo_gallium_sources = drm/cairo-drm-gallium-surface.c
--cairo_drm_xr_headers = cairo-drm-xr.h
--cairo_drm_xr_sources = \
--		    drm/cairo-drm-xr.c \
--		    $(NULL)
--
--cairo_script_headers = cairo-script.h
--cairo_script_sources = cairo-script-surface.c
--cairo_tee_headers = cairo-tee.h
--cairo_tee_private = cairo-tee-surface-private.h
--cairo_tee_sources = cairo-tee-surface.c
--cairo_xml_headers = cairo-xml.h
--cairo_xml_sources = cairo-xml-surface.c
--cairo_vg_headers = cairo-vg.h
--cairo_vg_sources = cairo-vg-surface.c
--supported_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
--	$(cairo_xlib_xrender_headers) $(cairo_xcb_shm_headers) \
--	$(cairo_quartz_headers) $(cairo_quartz_font_headers) \
--	$(cairo_win32_headers) $(cairo_win32_font_headers) \
--	$(cairo_png_headers) $(cairo_egl_headers) $(cairo_glx_headers) \
--	$(cairo_wgl_headers) $(cairo_ft_headers) $(cairo_fc_headers) \
--	$(cairo_ps_headers) $(cairo_pdf_headers) $(cairo_svg_headers) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(cairo_user_headers) $(cairo_gobject_headers)
--unsupported_cairo_headers = $(cairo_xcb_headers) \
--	$(cairo_xlib_xcb_headers) $(cairo_qt_headers) \
--	$(cairo_quartz_image_headers) $(cairo_skia_headers) \
--	$(cairo_os2_headers) $(cairo_beos_headers) \
--	$(cairo_drm_headers) $(cairo_drm_xr_headers) \
--	$(cairo_gallium_headers) $(cairo_xcb_drm_headers) \
--	$(cairo_gl_headers) $(cairo_directfb_headers) \
--	$(cairo_vg_headers) $(cairo_script_headers) \
--	$(cairo_tee_headers) $(cairo_xml_headers)
--all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
--	$(cairo_xlib_xrender_headers) $(cairo_xcb_headers) \
--	$(cairo_xlib_xcb_headers) $(cairo_xcb_shm_headers) \
--	$(cairo_qt_headers) $(cairo_quartz_headers) \
--	$(cairo_quartz_font_headers) $(cairo_quartz_image_headers) \
--	$(cairo_win32_headers) $(cairo_win32_font_headers) \
--	$(cairo_skia_headers) $(cairo_os2_headers) \
--	$(cairo_beos_headers) $(cairo_drm_headers) \
--	$(cairo_drm_xr_headers) $(cairo_gallium_headers) \
--	$(cairo_xcb_drm_headers) $(cairo_png_headers) \
--	$(cairo_gl_headers) $(cairo_directfb_headers) \
--	$(cairo_vg_headers) $(cairo_egl_headers) $(cairo_glx_headers) \
--	$(cairo_wgl_headers) $(cairo_script_headers) \
--	$(cairo_ft_headers) $(cairo_fc_headers) $(cairo_ps_headers) \
--	$(cairo_pdf_headers) $(cairo_svg_headers) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(cairo_tee_headers) $(cairo_xml_headers) \
--	$(cairo_user_headers) $(cairo_gobject_headers)
--all_cairo_private = $(cairo_private) $(cairo_xlib_private) \
--	$(cairo_xlib_xrender_private) $(cairo_xcb_private) \
--	$(cairo_xlib_xcb_private) $(cairo_xcb_shm_private) \
--	$(cairo_qt_private) $(cairo_quartz_private) \
--	$(cairo_quartz_font_private) $(cairo_quartz_image_private) \
--	$(cairo_win32_private) $(cairo_win32_font_private) \
--	$(cairo_skia_private) $(cairo_os2_private) \
--	$(cairo_beos_private) $(cairo_drm_private) \
--	$(cairo_drm_xr_private) $(cairo_gallium_private) \
--	$(cairo_xcb_drm_private) $(cairo_png_private) \
--	$(cairo_gl_private) $(cairo_directfb_private) \
--	$(cairo_vg_private) $(cairo_egl_private) $(cairo_glx_private) \
--	$(cairo_wgl_private) $(cairo_script_private) \
--	$(cairo_ft_private) $(cairo_fc_private) $(cairo_ps_private) \
--	$(cairo_pdf_private) $(cairo_svg_private) \
--	$(cairo_test_surfaces_private) $(cairo_test_surfaces_headers) \
--	$(cairo_image_private) $(cairo_recording_private) \
--	$(cairo_tee_private) $(cairo_xml_private) \
--	$(cairo_user_private) $(cairo_pthread_private) \
--	$(cairo_pthread_headers) $(cairo_gobject_private) \
--	$(cairo_trace_private) $(cairo_trace_headers) \
--	$(cairo_interpreter_private) $(cairo_interpreter_headers) \
--	$(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \
--	$(cairo_xlib_xrender_cxx_sources) $(cairo_xcb_cxx_sources) \
--	$(cairo_xlib_xcb_cxx_sources) $(cairo_xcb_shm_cxx_sources) \
--	$(cairo_qt_cxx_sources) $(cairo_quartz_cxx_sources) \
--	$(cairo_quartz_font_cxx_sources) \
--	$(cairo_quartz_image_cxx_sources) $(cairo_win32_cxx_sources) \
--	$(cairo_win32_font_cxx_sources) $(cairo_skia_cxx_sources) \
--	$(cairo_os2_cxx_sources) $(cairo_beos_cxx_sources) \
--	$(cairo_drm_cxx_sources) $(cairo_drm_xr_cxx_sources) \
--	$(cairo_gallium_cxx_sources) $(cairo_xcb_drm_cxx_sources) \
--	$(cairo_png_cxx_sources) $(cairo_gl_cxx_sources) \
--	$(cairo_directfb_cxx_sources) $(cairo_vg_cxx_sources) \
--	$(cairo_egl_cxx_sources) $(cairo_glx_cxx_sources) \
--	$(cairo_wgl_cxx_sources) $(cairo_script_cxx_sources) \
--	$(cairo_ft_cxx_sources) $(cairo_fc_cxx_sources) \
--	$(cairo_ps_cxx_sources) $(cairo_pdf_cxx_sources) \
--	$(cairo_svg_cxx_sources) $(cairo_test_surfaces_cxx_sources) \
--	$(cairo_image_cxx_sources) $(cairo_recording_cxx_sources) \
--	$(cairo_tee_cxx_sources) $(cairo_xml_cxx_sources) \
--	$(cairo_user_cxx_sources) $(cairo_pthread_cxx_sources) \
--	$(cairo_gobject_cxx_sources) $(cairo_trace_cxx_sources) \
--	$(cairo_interpreter_cxx_sources) \
--	$(cairo_symbol_lookup_cxx_sources)
--all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \
--	$(cairo_xlib_xrender_sources) $(cairo_xcb_sources) \
--	$(cairo_xlib_xcb_sources) $(cairo_xcb_shm_sources) \
--	$(cairo_qt_sources) $(cairo_quartz_sources) \
--	$(cairo_quartz_font_sources) $(cairo_quartz_image_sources) \
--	$(cairo_win32_sources) $(cairo_win32_font_sources) \
--	$(cairo_skia_sources) $(cairo_os2_sources) \
--	$(cairo_beos_sources) $(cairo_drm_sources) \
--	$(cairo_drm_xr_sources) $(cairo_gallium_sources) \
--	$(cairo_xcb_drm_sources) $(cairo_png_sources) \
--	$(cairo_gl_sources) $(cairo_directfb_sources) \
--	$(cairo_vg_sources) $(cairo_egl_sources) $(cairo_glx_sources) \
--	$(cairo_wgl_sources) $(cairo_script_sources) \
--	$(cairo_ft_sources) $(cairo_fc_sources) $(cairo_ps_sources) \
--	$(cairo_pdf_sources) $(cairo_svg_sources) \
--	$(cairo_test_surfaces_sources) $(cairo_image_sources) \
--	$(cairo_recording_sources) $(cairo_tee_sources) \
--	$(cairo_xml_sources) $(cairo_user_sources) \
--	$(cairo_pthread_sources) $(cairo_gobject_sources) \
--	$(cairo_trace_sources) $(cairo_interpreter_sources) \
--	$(cairo_symbol_lookup_sources)
--enabled_cairo_headers = $(cairo_headers) $(am__append_3) \
--	$(am__append_8) $(am__append_13) $(am__append_18) \
--	$(am__append_23) $(am__append_28) $(am__append_33) \
--	$(am__append_38) $(am__append_43) $(am__append_48) \
--	$(am__append_53) $(am__append_58) $(am__append_63) \
--	$(am__append_68) $(am__append_73) $(am__append_78) \
--	$(am__append_83) $(am__append_88) $(am__append_93) \
--	$(am__append_98) $(am__append_103) $(am__append_108) \
--	$(am__append_113) $(am__append_118) $(am__append_123) \
--	$(am__append_128) $(am__append_133) $(am__append_138) \
--	$(am__append_143) $(am__append_148) $(am__append_153) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(am__append_161) $(am__append_166) $(cairo_user_headers) \
--	$(am__append_174)
--enabled_cairo_private = $(cairo_private) $(am__append_4) \
--	$(am__append_9) $(am__append_14) $(am__append_19) \
--	$(am__append_24) $(am__append_29) $(am__append_34) \
--	$(am__append_39) $(am__append_44) $(am__append_49) \
--	$(am__append_54) $(am__append_59) $(am__append_64) \
--	$(am__append_69) $(am__append_74) $(am__append_79) \
--	$(am__append_84) $(am__append_89) $(am__append_94) \
--	$(am__append_99) $(am__append_104) $(am__append_109) \
--	$(am__append_114) $(am__append_119) $(am__append_124) \
--	$(am__append_129) $(am__append_134) $(am__append_139) \
--	$(am__append_144) $(am__append_149) $(am__append_154) \
--	$(am__append_158) $(cairo_image_private) \
--	$(cairo_recording_private) $(am__append_162) $(am__append_167) \
--	$(cairo_user_private) $(am__append_171) $(am__append_175) \
--	$(am__append_179) $(am__append_182) $(am__append_185)
--enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \
--	$(am__append_10) $(am__append_15) $(am__append_20) \
--	$(am__append_25) $(am__append_30) $(am__append_35) \
--	$(am__append_40) $(am__append_45) $(am__append_50) \
--	$(am__append_55) $(am__append_60) $(am__append_65) \
--	$(am__append_70) $(am__append_75) $(am__append_80) \
--	$(am__append_85) $(am__append_90) $(am__append_95) \
--	$(am__append_100) $(am__append_105) $(am__append_110) \
--	$(am__append_115) $(am__append_120) $(am__append_125) \
--	$(am__append_130) $(am__append_135) $(am__append_140) \
--	$(am__append_145) $(am__append_150) $(am__append_155) \
--	$(am__append_159) $(cairo_image_cxx_sources) \
--	$(cairo_recording_cxx_sources) $(am__append_163) \
--	$(am__append_168) $(cairo_user_cxx_sources) $(am__append_172) \
--	$(am__append_176) $(am__append_180) $(am__append_183) \
--	$(am__append_186)
--enabled_cairo_sources = $(cairo_sources) $(am__append_6) \
--	$(am__append_11) $(am__append_16) $(am__append_21) \
--	$(am__append_26) $(am__append_31) $(am__append_36) \
--	$(am__append_41) $(am__append_46) $(am__append_51) \
--	$(am__append_56) $(am__append_61) $(am__append_66) \
--	$(am__append_71) $(am__append_76) $(am__append_81) \
--	$(am__append_86) $(am__append_91) $(am__append_96) \
--	$(am__append_101) $(am__append_106) $(am__append_111) \
--	$(am__append_116) $(am__append_121) $(am__append_126) \
--	$(am__append_131) $(am__append_136) $(am__append_141) \
--	$(am__append_146) $(am__append_151) $(am__append_156) \
--	$(am__append_160) $(cairo_image_sources) \
--	$(cairo_recording_sources) $(am__append_164) $(am__append_169) \
--	$(cairo_user_sources) $(am__append_173) $(am__append_177) \
--	$(am__append_181) $(am__append_184) $(am__append_187)
--all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \
--	cairo-xcb.pc cairo-xlib-xcb.pc cairo-xcb-shm.pc cairo-qt.pc \
--	cairo-quartz.pc cairo-quartz-font.pc cairo-quartz-image.pc \
--	cairo-win32.pc cairo-win32-font.pc cairo-skia.pc cairo-os2.pc \
--	cairo-beos.pc cairo-drm.pc cairo-drm-xr.pc cairo-gallium.pc \
--	cairo-xcb-drm.pc cairo-png.pc cairo-gl.pc cairo-directfb.pc \
--	cairo-vg.pc cairo-egl.pc cairo-glx.pc cairo-wgl.pc \
--	cairo-script.pc cairo-ft.pc cairo-fc.pc cairo-ps.pc \
--	cairo-pdf.pc cairo-svg.pc cairo-tee.pc cairo-xml.pc \
--	cairo-gobject.pc
--enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \
--	$(am__append_17) $(am__append_22) $(am__append_27) \
--	$(am__append_32) $(am__append_37) $(am__append_42) \
--	$(am__append_47) $(am__append_52) $(am__append_57) \
--	$(am__append_62) $(am__append_67) $(am__append_72) \
--	$(am__append_77) $(am__append_82) $(am__append_87) \
--	$(am__append_92) $(am__append_97) $(am__append_102) \
--	$(am__append_107) $(am__append_112) $(am__append_117) \
--	$(am__append_122) $(am__append_127) $(am__append_132) \
--	$(am__append_137) $(am__append_142) $(am__append_147) \
--	$(am__append_152) $(am__append_157) $(am__append_165) \
--	$(am__append_170) $(am__append_178)
-+TESTS = $(am__append_1) check-doc-syntax.sh
- 
- # The name of the module.
- DOC_MODULE = cairo
-@@ -1038,7 +393,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(top_srcdir)/src/Makefile.am.features $(top_srcdir)/src/Makefile.sources $(top_srcdir)/build/Makefile.am.gtk-doc $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(top_srcdir)/src/Makefile.am.features $(top_srcdir)/build/Makefile.am.gtk-doc $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -1063,9 +418,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
-Index: cairo/src/Makefile.am.features
-===================================================================
---- cairo.orig/src/Makefile.am.features	2010-09-06 23:50:27.491408777 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,637 +0,0 @@
--# Generated by configure.  Do not edit.
--
--include $(top_srcdir)/src/Makefile.sources
--
--supported_cairo_headers = $(cairo_headers)
--unsupported_cairo_headers =
--all_cairo_headers = $(cairo_headers)
--all_cairo_private = $(cairo_private)
--all_cairo_cxx_sources = $(cairo_cxx_sources)
--all_cairo_sources = $(cairo_sources)
--
--enabled_cairo_headers = $(cairo_headers)
--enabled_cairo_private = $(cairo_private)
--enabled_cairo_cxx_sources = $(cairo_cxx_sources)
--enabled_cairo_sources = $(cairo_sources)
--
--all_cairo_pkgconf = cairo.pc
--enabled_cairo_pkgconf = cairo.pc
--
--supported_cairo_headers += $(cairo_xlib_headers)
--all_cairo_headers += $(cairo_xlib_headers)
--all_cairo_private += $(cairo_xlib_private)
--all_cairo_cxx_sources += $(cairo_xlib_cxx_sources)
--all_cairo_sources += $(cairo_xlib_sources)
--if CAIRO_HAS_XLIB_SURFACE
--enabled_cairo_headers += $(cairo_xlib_headers)
--enabled_cairo_private += $(cairo_xlib_private)
--enabled_cairo_cxx_sources += $(cairo_xlib_cxx_sources)
--enabled_cairo_sources += $(cairo_xlib_sources)
--endif
--all_cairo_pkgconf += cairo-xlib.pc
--if CAIRO_HAS_XLIB_SURFACE
--enabled_cairo_pkgconf += cairo-xlib.pc
--endif
--
--supported_cairo_headers += $(cairo_xlib_xrender_headers)
--all_cairo_headers += $(cairo_xlib_xrender_headers)
--all_cairo_private += $(cairo_xlib_xrender_private)
--all_cairo_cxx_sources += $(cairo_xlib_xrender_cxx_sources)
--all_cairo_sources += $(cairo_xlib_xrender_sources)
--if CAIRO_HAS_XLIB_XRENDER_SURFACE
--enabled_cairo_headers += $(cairo_xlib_xrender_headers)
--enabled_cairo_private += $(cairo_xlib_xrender_private)
--enabled_cairo_cxx_sources += $(cairo_xlib_xrender_cxx_sources)
--enabled_cairo_sources += $(cairo_xlib_xrender_sources)
--endif
--all_cairo_pkgconf += cairo-xlib-xrender.pc
--if CAIRO_HAS_XLIB_XRENDER_SURFACE
--enabled_cairo_pkgconf += cairo-xlib-xrender.pc
--endif
--
--unsupported_cairo_headers += $(cairo_xcb_headers)
--all_cairo_headers += $(cairo_xcb_headers)
--all_cairo_private += $(cairo_xcb_private)
--all_cairo_cxx_sources += $(cairo_xcb_cxx_sources)
--all_cairo_sources += $(cairo_xcb_sources)
--if CAIRO_HAS_XCB_SURFACE
--enabled_cairo_headers += $(cairo_xcb_headers)
--enabled_cairo_private += $(cairo_xcb_private)
--enabled_cairo_cxx_sources += $(cairo_xcb_cxx_sources)
--enabled_cairo_sources += $(cairo_xcb_sources)
--endif
--all_cairo_pkgconf += cairo-xcb.pc
--if CAIRO_HAS_XCB_SURFACE
--enabled_cairo_pkgconf += cairo-xcb.pc
--endif
--
--unsupported_cairo_headers += $(cairo_xlib_xcb_headers)
--all_cairo_headers += $(cairo_xlib_xcb_headers)
--all_cairo_private += $(cairo_xlib_xcb_private)
--all_cairo_cxx_sources += $(cairo_xlib_xcb_cxx_sources)
--all_cairo_sources += $(cairo_xlib_xcb_sources)
--if CAIRO_HAS_XLIB_XCB_FUNCTIONS
--enabled_cairo_headers += $(cairo_xlib_xcb_headers)
--enabled_cairo_private += $(cairo_xlib_xcb_private)
--enabled_cairo_cxx_sources += $(cairo_xlib_xcb_cxx_sources)
--enabled_cairo_sources += $(cairo_xlib_xcb_sources)
--endif
--all_cairo_pkgconf += cairo-xlib-xcb.pc
--if CAIRO_HAS_XLIB_XCB_FUNCTIONS
--enabled_cairo_pkgconf += cairo-xlib-xcb.pc
--endif
--
--supported_cairo_headers += $(cairo_xcb_shm_headers)
--all_cairo_headers += $(cairo_xcb_shm_headers)
--all_cairo_private += $(cairo_xcb_shm_private)
--all_cairo_cxx_sources += $(cairo_xcb_shm_cxx_sources)
--all_cairo_sources += $(cairo_xcb_shm_sources)
--if CAIRO_HAS_XCB_SHM_FUNCTIONS
--enabled_cairo_headers += $(cairo_xcb_shm_headers)
--enabled_cairo_private += $(cairo_xcb_shm_private)
--enabled_cairo_cxx_sources += $(cairo_xcb_shm_cxx_sources)
--enabled_cairo_sources += $(cairo_xcb_shm_sources)
--endif
--all_cairo_pkgconf += cairo-xcb-shm.pc
--if CAIRO_HAS_XCB_SHM_FUNCTIONS
--enabled_cairo_pkgconf += cairo-xcb-shm.pc
--endif
--
--unsupported_cairo_headers += $(cairo_qt_headers)
--all_cairo_headers += $(cairo_qt_headers)
--all_cairo_private += $(cairo_qt_private)
--all_cairo_cxx_sources += $(cairo_qt_cxx_sources)
--all_cairo_sources += $(cairo_qt_sources)
--if CAIRO_HAS_QT_SURFACE
--enabled_cairo_headers += $(cairo_qt_headers)
--enabled_cairo_private += $(cairo_qt_private)
--enabled_cairo_cxx_sources += $(cairo_qt_cxx_sources)
--enabled_cairo_sources += $(cairo_qt_sources)
--endif
--all_cairo_pkgconf += cairo-qt.pc
--if CAIRO_HAS_QT_SURFACE
--enabled_cairo_pkgconf += cairo-qt.pc
--endif
--
--supported_cairo_headers += $(cairo_quartz_headers)
--all_cairo_headers += $(cairo_quartz_headers)
--all_cairo_private += $(cairo_quartz_private)
--all_cairo_cxx_sources += $(cairo_quartz_cxx_sources)
--all_cairo_sources += $(cairo_quartz_sources)
--if CAIRO_HAS_QUARTZ_SURFACE
--enabled_cairo_headers += $(cairo_quartz_headers)
--enabled_cairo_private += $(cairo_quartz_private)
--enabled_cairo_cxx_sources += $(cairo_quartz_cxx_sources)
--enabled_cairo_sources += $(cairo_quartz_sources)
--endif
--all_cairo_pkgconf += cairo-quartz.pc
--if CAIRO_HAS_QUARTZ_SURFACE
--enabled_cairo_pkgconf += cairo-quartz.pc
--endif
--
--supported_cairo_headers += $(cairo_quartz_font_headers)
--all_cairo_headers += $(cairo_quartz_font_headers)
--all_cairo_private += $(cairo_quartz_font_private)
--all_cairo_cxx_sources += $(cairo_quartz_font_cxx_sources)
--all_cairo_sources += $(cairo_quartz_font_sources)
--if CAIRO_HAS_QUARTZ_FONT
--enabled_cairo_headers += $(cairo_quartz_font_headers)
--enabled_cairo_private += $(cairo_quartz_font_private)
--enabled_cairo_cxx_sources += $(cairo_quartz_font_cxx_sources)
--enabled_cairo_sources += $(cairo_quartz_font_sources)
--endif
--all_cairo_pkgconf += cairo-quartz-font.pc
--if CAIRO_HAS_QUARTZ_FONT
--enabled_cairo_pkgconf += cairo-quartz-font.pc
--endif
--
--unsupported_cairo_headers += $(cairo_quartz_image_headers)
--all_cairo_headers += $(cairo_quartz_image_headers)
--all_cairo_private += $(cairo_quartz_image_private)
--all_cairo_cxx_sources += $(cairo_quartz_image_cxx_sources)
--all_cairo_sources += $(cairo_quartz_image_sources)
--if CAIRO_HAS_QUARTZ_IMAGE_SURFACE
--enabled_cairo_headers += $(cairo_quartz_image_headers)
--enabled_cairo_private += $(cairo_quartz_image_private)
--enabled_cairo_cxx_sources += $(cairo_quartz_image_cxx_sources)
--enabled_cairo_sources += $(cairo_quartz_image_sources)
--endif
--all_cairo_pkgconf += cairo-quartz-image.pc
--if CAIRO_HAS_QUARTZ_IMAGE_SURFACE
--enabled_cairo_pkgconf += cairo-quartz-image.pc
--endif
--
--supported_cairo_headers += $(cairo_win32_headers)
--all_cairo_headers += $(cairo_win32_headers)
--all_cairo_private += $(cairo_win32_private)
--all_cairo_cxx_sources += $(cairo_win32_cxx_sources)
--all_cairo_sources += $(cairo_win32_sources)
--if CAIRO_HAS_WIN32_SURFACE
--enabled_cairo_headers += $(cairo_win32_headers)
--enabled_cairo_private += $(cairo_win32_private)
--enabled_cairo_cxx_sources += $(cairo_win32_cxx_sources)
--enabled_cairo_sources += $(cairo_win32_sources)
--endif
--all_cairo_pkgconf += cairo-win32.pc
--if CAIRO_HAS_WIN32_SURFACE
--enabled_cairo_pkgconf += cairo-win32.pc
--endif
--
--supported_cairo_headers += $(cairo_win32_font_headers)
--all_cairo_headers += $(cairo_win32_font_headers)
--all_cairo_private += $(cairo_win32_font_private)
--all_cairo_cxx_sources += $(cairo_win32_font_cxx_sources)
--all_cairo_sources += $(cairo_win32_font_sources)
--if CAIRO_HAS_WIN32_FONT
--enabled_cairo_headers += $(cairo_win32_font_headers)
--enabled_cairo_private += $(cairo_win32_font_private)
--enabled_cairo_cxx_sources += $(cairo_win32_font_cxx_sources)
--enabled_cairo_sources += $(cairo_win32_font_sources)
--endif
--all_cairo_pkgconf += cairo-win32-font.pc
--if CAIRO_HAS_WIN32_FONT
--enabled_cairo_pkgconf += cairo-win32-font.pc
--endif
--
--unsupported_cairo_headers += $(cairo_skia_headers)
--all_cairo_headers += $(cairo_skia_headers)
--all_cairo_private += $(cairo_skia_private)
--all_cairo_cxx_sources += $(cairo_skia_cxx_sources)
--all_cairo_sources += $(cairo_skia_sources)
--if CAIRO_HAS_SKIA_SURFACE
--enabled_cairo_headers += $(cairo_skia_headers)
--enabled_cairo_private += $(cairo_skia_private)
--enabled_cairo_cxx_sources += $(cairo_skia_cxx_sources)
--enabled_cairo_sources += $(cairo_skia_sources)
--endif
--all_cairo_pkgconf += cairo-skia.pc
--if CAIRO_HAS_SKIA_SURFACE
--enabled_cairo_pkgconf += cairo-skia.pc
--endif
--
--unsupported_cairo_headers += $(cairo_os2_headers)
--all_cairo_headers += $(cairo_os2_headers)
--all_cairo_private += $(cairo_os2_private)
--all_cairo_cxx_sources += $(cairo_os2_cxx_sources)
--all_cairo_sources += $(cairo_os2_sources)
--if CAIRO_HAS_OS2_SURFACE
--enabled_cairo_headers += $(cairo_os2_headers)
--enabled_cairo_private += $(cairo_os2_private)
--enabled_cairo_cxx_sources += $(cairo_os2_cxx_sources)
--enabled_cairo_sources += $(cairo_os2_sources)
--endif
--all_cairo_pkgconf += cairo-os2.pc
--if CAIRO_HAS_OS2_SURFACE
--enabled_cairo_pkgconf += cairo-os2.pc
--endif
--
--unsupported_cairo_headers += $(cairo_beos_headers)
--all_cairo_headers += $(cairo_beos_headers)
--all_cairo_private += $(cairo_beos_private)
--all_cairo_cxx_sources += $(cairo_beos_cxx_sources)
--all_cairo_sources += $(cairo_beos_sources)
--if CAIRO_HAS_BEOS_SURFACE
--enabled_cairo_headers += $(cairo_beos_headers)
--enabled_cairo_private += $(cairo_beos_private)
--enabled_cairo_cxx_sources += $(cairo_beos_cxx_sources)
--enabled_cairo_sources += $(cairo_beos_sources)
--endif
--all_cairo_pkgconf += cairo-beos.pc
--if CAIRO_HAS_BEOS_SURFACE
--enabled_cairo_pkgconf += cairo-beos.pc
--endif
--
--unsupported_cairo_headers += $(cairo_drm_headers)
--all_cairo_headers += $(cairo_drm_headers)
--all_cairo_private += $(cairo_drm_private)
--all_cairo_cxx_sources += $(cairo_drm_cxx_sources)
--all_cairo_sources += $(cairo_drm_sources)
--if CAIRO_HAS_DRM_SURFACE
--enabled_cairo_headers += $(cairo_drm_headers)
--enabled_cairo_private += $(cairo_drm_private)
--enabled_cairo_cxx_sources += $(cairo_drm_cxx_sources)
--enabled_cairo_sources += $(cairo_drm_sources)
--endif
--all_cairo_pkgconf += cairo-drm.pc
--if CAIRO_HAS_DRM_SURFACE
--enabled_cairo_pkgconf += cairo-drm.pc
--endif
--
--unsupported_cairo_headers += $(cairo_drm_xr_headers)
--all_cairo_headers += $(cairo_drm_xr_headers)
--all_cairo_private += $(cairo_drm_xr_private)
--all_cairo_cxx_sources += $(cairo_drm_xr_cxx_sources)
--all_cairo_sources += $(cairo_drm_xr_sources)
--if CAIRO_HAS_DRM_XR_FUNCTIONS
--enabled_cairo_headers += $(cairo_drm_xr_headers)
--enabled_cairo_private += $(cairo_drm_xr_private)
--enabled_cairo_cxx_sources += $(cairo_drm_xr_cxx_sources)
--enabled_cairo_sources += $(cairo_drm_xr_sources)
--endif
--all_cairo_pkgconf += cairo-drm-xr.pc
--if CAIRO_HAS_DRM_XR_FUNCTIONS
--enabled_cairo_pkgconf += cairo-drm-xr.pc
--endif
--
--unsupported_cairo_headers += $(cairo_gallium_headers)
--all_cairo_headers += $(cairo_gallium_headers)
--all_cairo_private += $(cairo_gallium_private)
--all_cairo_cxx_sources += $(cairo_gallium_cxx_sources)
--all_cairo_sources += $(cairo_gallium_sources)
--if CAIRO_HAS_GALLIUM_SURFACE
--enabled_cairo_headers += $(cairo_gallium_headers)
--enabled_cairo_private += $(cairo_gallium_private)
--enabled_cairo_cxx_sources += $(cairo_gallium_cxx_sources)
--enabled_cairo_sources += $(cairo_gallium_sources)
--endif
--all_cairo_pkgconf += cairo-gallium.pc
--if CAIRO_HAS_GALLIUM_SURFACE
--enabled_cairo_pkgconf += cairo-gallium.pc
--endif
--
--unsupported_cairo_headers += $(cairo_xcb_drm_headers)
--all_cairo_headers += $(cairo_xcb_drm_headers)
--all_cairo_private += $(cairo_xcb_drm_private)
--all_cairo_cxx_sources += $(cairo_xcb_drm_cxx_sources)
--all_cairo_sources += $(cairo_xcb_drm_sources)
--if CAIRO_HAS_XCB_DRM_FUNCTIONS
--enabled_cairo_headers += $(cairo_xcb_drm_headers)
--enabled_cairo_private += $(cairo_xcb_drm_private)
--enabled_cairo_cxx_sources += $(cairo_xcb_drm_cxx_sources)
--enabled_cairo_sources += $(cairo_xcb_drm_sources)
--endif
--all_cairo_pkgconf += cairo-xcb-drm.pc
--if CAIRO_HAS_XCB_DRM_FUNCTIONS
--enabled_cairo_pkgconf += cairo-xcb-drm.pc
--endif
--
--supported_cairo_headers += $(cairo_png_headers)
--all_cairo_headers += $(cairo_png_headers)
--all_cairo_private += $(cairo_png_private)
--all_cairo_cxx_sources += $(cairo_png_cxx_sources)
--all_cairo_sources += $(cairo_png_sources)
--if CAIRO_HAS_PNG_FUNCTIONS
--enabled_cairo_headers += $(cairo_png_headers)
--enabled_cairo_private += $(cairo_png_private)
--enabled_cairo_cxx_sources += $(cairo_png_cxx_sources)
--enabled_cairo_sources += $(cairo_png_sources)
--endif
--all_cairo_pkgconf += cairo-png.pc
--if CAIRO_HAS_PNG_FUNCTIONS
--enabled_cairo_pkgconf += cairo-png.pc
--endif
--
--unsupported_cairo_headers += $(cairo_gl_headers)
--all_cairo_headers += $(cairo_gl_headers)
--all_cairo_private += $(cairo_gl_private)
--all_cairo_cxx_sources += $(cairo_gl_cxx_sources)
--all_cairo_sources += $(cairo_gl_sources)
--if CAIRO_HAS_GL_SURFACE
--enabled_cairo_headers += $(cairo_gl_headers)
--enabled_cairo_private += $(cairo_gl_private)
--enabled_cairo_cxx_sources += $(cairo_gl_cxx_sources)
--enabled_cairo_sources += $(cairo_gl_sources)
--endif
--all_cairo_pkgconf += cairo-gl.pc
--if CAIRO_HAS_GL_SURFACE
--enabled_cairo_pkgconf += cairo-gl.pc
--endif
--
--unsupported_cairo_headers += $(cairo_directfb_headers)
--all_cairo_headers += $(cairo_directfb_headers)
--all_cairo_private += $(cairo_directfb_private)
--all_cairo_cxx_sources += $(cairo_directfb_cxx_sources)
--all_cairo_sources += $(cairo_directfb_sources)
--if CAIRO_HAS_DIRECTFB_SURFACE
--enabled_cairo_headers += $(cairo_directfb_headers)
--enabled_cairo_private += $(cairo_directfb_private)
--enabled_cairo_cxx_sources += $(cairo_directfb_cxx_sources)
--enabled_cairo_sources += $(cairo_directfb_sources)
--endif
--all_cairo_pkgconf += cairo-directfb.pc
--if CAIRO_HAS_DIRECTFB_SURFACE
--enabled_cairo_pkgconf += cairo-directfb.pc
--endif
--
--unsupported_cairo_headers += $(cairo_vg_headers)
--all_cairo_headers += $(cairo_vg_headers)
--all_cairo_private += $(cairo_vg_private)
--all_cairo_cxx_sources += $(cairo_vg_cxx_sources)
--all_cairo_sources += $(cairo_vg_sources)
--if CAIRO_HAS_VG_SURFACE
--enabled_cairo_headers += $(cairo_vg_headers)
--enabled_cairo_private += $(cairo_vg_private)
--enabled_cairo_cxx_sources += $(cairo_vg_cxx_sources)
--enabled_cairo_sources += $(cairo_vg_sources)
--endif
--all_cairo_pkgconf += cairo-vg.pc
--if CAIRO_HAS_VG_SURFACE
--enabled_cairo_pkgconf += cairo-vg.pc
--endif
--
--supported_cairo_headers += $(cairo_egl_headers)
--all_cairo_headers += $(cairo_egl_headers)
--all_cairo_private += $(cairo_egl_private)
--all_cairo_cxx_sources += $(cairo_egl_cxx_sources)
--all_cairo_sources += $(cairo_egl_sources)
--if CAIRO_HAS_EGL_FUNCTIONS
--enabled_cairo_headers += $(cairo_egl_headers)
--enabled_cairo_private += $(cairo_egl_private)
--enabled_cairo_cxx_sources += $(cairo_egl_cxx_sources)
--enabled_cairo_sources += $(cairo_egl_sources)
--endif
--all_cairo_pkgconf += cairo-egl.pc
--if CAIRO_HAS_EGL_FUNCTIONS
--enabled_cairo_pkgconf += cairo-egl.pc
--endif
--
--supported_cairo_headers += $(cairo_glx_headers)
--all_cairo_headers += $(cairo_glx_headers)
--all_cairo_private += $(cairo_glx_private)
--all_cairo_cxx_sources += $(cairo_glx_cxx_sources)
--all_cairo_sources += $(cairo_glx_sources)
--if CAIRO_HAS_GLX_FUNCTIONS
--enabled_cairo_headers += $(cairo_glx_headers)
--enabled_cairo_private += $(cairo_glx_private)
--enabled_cairo_cxx_sources += $(cairo_glx_cxx_sources)
--enabled_cairo_sources += $(cairo_glx_sources)
--endif
--all_cairo_pkgconf += cairo-glx.pc
--if CAIRO_HAS_GLX_FUNCTIONS
--enabled_cairo_pkgconf += cairo-glx.pc
--endif
--
--supported_cairo_headers += $(cairo_wgl_headers)
--all_cairo_headers += $(cairo_wgl_headers)
--all_cairo_private += $(cairo_wgl_private)
--all_cairo_cxx_sources += $(cairo_wgl_cxx_sources)
--all_cairo_sources += $(cairo_wgl_sources)
--if CAIRO_HAS_WGL_FUNCTIONS
--enabled_cairo_headers += $(cairo_wgl_headers)
--enabled_cairo_private += $(cairo_wgl_private)
--enabled_cairo_cxx_sources += $(cairo_wgl_cxx_sources)
--enabled_cairo_sources += $(cairo_wgl_sources)
--endif
--all_cairo_pkgconf += cairo-wgl.pc
--if CAIRO_HAS_WGL_FUNCTIONS
--enabled_cairo_pkgconf += cairo-wgl.pc
--endif
--
--unsupported_cairo_headers += $(cairo_script_headers)
--all_cairo_headers += $(cairo_script_headers)
--all_cairo_private += $(cairo_script_private)
--all_cairo_cxx_sources += $(cairo_script_cxx_sources)
--all_cairo_sources += $(cairo_script_sources)
--if CAIRO_HAS_SCRIPT_SURFACE
--enabled_cairo_headers += $(cairo_script_headers)
--enabled_cairo_private += $(cairo_script_private)
--enabled_cairo_cxx_sources += $(cairo_script_cxx_sources)
--enabled_cairo_sources += $(cairo_script_sources)
--endif
--all_cairo_pkgconf += cairo-script.pc
--if CAIRO_HAS_SCRIPT_SURFACE
--enabled_cairo_pkgconf += cairo-script.pc
--endif
--
--supported_cairo_headers += $(cairo_ft_headers)
--all_cairo_headers += $(cairo_ft_headers)
--all_cairo_private += $(cairo_ft_private)
--all_cairo_cxx_sources += $(cairo_ft_cxx_sources)
--all_cairo_sources += $(cairo_ft_sources)
--if CAIRO_HAS_FT_FONT
--enabled_cairo_headers += $(cairo_ft_headers)
--enabled_cairo_private += $(cairo_ft_private)
--enabled_cairo_cxx_sources += $(cairo_ft_cxx_sources)
--enabled_cairo_sources += $(cairo_ft_sources)
--endif
--all_cairo_pkgconf += cairo-ft.pc
--if CAIRO_HAS_FT_FONT
--enabled_cairo_pkgconf += cairo-ft.pc
--endif
--
--supported_cairo_headers += $(cairo_fc_headers)
--all_cairo_headers += $(cairo_fc_headers)
--all_cairo_private += $(cairo_fc_private)
--all_cairo_cxx_sources += $(cairo_fc_cxx_sources)
--all_cairo_sources += $(cairo_fc_sources)
--if CAIRO_HAS_FC_FONT
--enabled_cairo_headers += $(cairo_fc_headers)
--enabled_cairo_private += $(cairo_fc_private)
--enabled_cairo_cxx_sources += $(cairo_fc_cxx_sources)
--enabled_cairo_sources += $(cairo_fc_sources)
--endif
--all_cairo_pkgconf += cairo-fc.pc
--if CAIRO_HAS_FC_FONT
--enabled_cairo_pkgconf += cairo-fc.pc
--endif
--
--supported_cairo_headers += $(cairo_ps_headers)
--all_cairo_headers += $(cairo_ps_headers)
--all_cairo_private += $(cairo_ps_private)
--all_cairo_cxx_sources += $(cairo_ps_cxx_sources)
--all_cairo_sources += $(cairo_ps_sources)
--if CAIRO_HAS_PS_SURFACE
--enabled_cairo_headers += $(cairo_ps_headers)
--enabled_cairo_private += $(cairo_ps_private)
--enabled_cairo_cxx_sources += $(cairo_ps_cxx_sources)
--enabled_cairo_sources += $(cairo_ps_sources)
--endif
--all_cairo_pkgconf += cairo-ps.pc
--if CAIRO_HAS_PS_SURFACE
--enabled_cairo_pkgconf += cairo-ps.pc
--endif
--
--supported_cairo_headers += $(cairo_pdf_headers)
--all_cairo_headers += $(cairo_pdf_headers)
--all_cairo_private += $(cairo_pdf_private)
--all_cairo_cxx_sources += $(cairo_pdf_cxx_sources)
--all_cairo_sources += $(cairo_pdf_sources)
--if CAIRO_HAS_PDF_SURFACE
--enabled_cairo_headers += $(cairo_pdf_headers)
--enabled_cairo_private += $(cairo_pdf_private)
--enabled_cairo_cxx_sources += $(cairo_pdf_cxx_sources)
--enabled_cairo_sources += $(cairo_pdf_sources)
--endif
--all_cairo_pkgconf += cairo-pdf.pc
--if CAIRO_HAS_PDF_SURFACE
--enabled_cairo_pkgconf += cairo-pdf.pc
--endif
--
--supported_cairo_headers += $(cairo_svg_headers)
--all_cairo_headers += $(cairo_svg_headers)
--all_cairo_private += $(cairo_svg_private)
--all_cairo_cxx_sources += $(cairo_svg_cxx_sources)
--all_cairo_sources += $(cairo_svg_sources)
--if CAIRO_HAS_SVG_SURFACE
--enabled_cairo_headers += $(cairo_svg_headers)
--enabled_cairo_private += $(cairo_svg_private)
--enabled_cairo_cxx_sources += $(cairo_svg_cxx_sources)
--enabled_cairo_sources += $(cairo_svg_sources)
--endif
--all_cairo_pkgconf += cairo-svg.pc
--if CAIRO_HAS_SVG_SURFACE
--enabled_cairo_pkgconf += cairo-svg.pc
--endif
--
--all_cairo_private += $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
--all_cairo_cxx_sources += $(cairo_test_surfaces_cxx_sources)
--all_cairo_sources += $(cairo_test_surfaces_sources)
--if CAIRO_HAS_TEST_SURFACES
--enabled_cairo_private += $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
--enabled_cairo_cxx_sources += $(cairo_test_surfaces_cxx_sources)
--enabled_cairo_sources += $(cairo_test_surfaces_sources)
--endif
--
--supported_cairo_headers += $(cairo_image_headers)
--all_cairo_headers += $(cairo_image_headers)
--all_cairo_private += $(cairo_image_private)
--all_cairo_cxx_sources += $(cairo_image_cxx_sources)
--all_cairo_sources += $(cairo_image_sources)
--enabled_cairo_headers += $(cairo_image_headers)
--enabled_cairo_private += $(cairo_image_private)
--enabled_cairo_cxx_sources += $(cairo_image_cxx_sources)
--enabled_cairo_sources += $(cairo_image_sources)
--
--supported_cairo_headers += $(cairo_recording_headers)
--all_cairo_headers += $(cairo_recording_headers)
--all_cairo_private += $(cairo_recording_private)
--all_cairo_cxx_sources += $(cairo_recording_cxx_sources)
--all_cairo_sources += $(cairo_recording_sources)
--enabled_cairo_headers += $(cairo_recording_headers)
--enabled_cairo_private += $(cairo_recording_private)
--enabled_cairo_cxx_sources += $(cairo_recording_cxx_sources)
--enabled_cairo_sources += $(cairo_recording_sources)
--
--unsupported_cairo_headers += $(cairo_tee_headers)
--all_cairo_headers += $(cairo_tee_headers)
--all_cairo_private += $(cairo_tee_private)
--all_cairo_cxx_sources += $(cairo_tee_cxx_sources)
--all_cairo_sources += $(cairo_tee_sources)
--if CAIRO_HAS_TEE_SURFACE
--enabled_cairo_headers += $(cairo_tee_headers)
--enabled_cairo_private += $(cairo_tee_private)
--enabled_cairo_cxx_sources += $(cairo_tee_cxx_sources)
--enabled_cairo_sources += $(cairo_tee_sources)
--endif
--all_cairo_pkgconf += cairo-tee.pc
--if CAIRO_HAS_TEE_SURFACE
--enabled_cairo_pkgconf += cairo-tee.pc
--endif
--
--unsupported_cairo_headers += $(cairo_xml_headers)
--all_cairo_headers += $(cairo_xml_headers)
--all_cairo_private += $(cairo_xml_private)
--all_cairo_cxx_sources += $(cairo_xml_cxx_sources)
--all_cairo_sources += $(cairo_xml_sources)
--if CAIRO_HAS_XML_SURFACE
--enabled_cairo_headers += $(cairo_xml_headers)
--enabled_cairo_private += $(cairo_xml_private)
--enabled_cairo_cxx_sources += $(cairo_xml_cxx_sources)
--enabled_cairo_sources += $(cairo_xml_sources)
--endif
--all_cairo_pkgconf += cairo-xml.pc
--if CAIRO_HAS_XML_SURFACE
--enabled_cairo_pkgconf += cairo-xml.pc
--endif
--
--supported_cairo_headers += $(cairo_user_headers)
--all_cairo_headers += $(cairo_user_headers)
--all_cairo_private += $(cairo_user_private)
--all_cairo_cxx_sources += $(cairo_user_cxx_sources)
--all_cairo_sources += $(cairo_user_sources)
--enabled_cairo_headers += $(cairo_user_headers)
--enabled_cairo_private += $(cairo_user_private)
--enabled_cairo_cxx_sources += $(cairo_user_cxx_sources)
--enabled_cairo_sources += $(cairo_user_sources)
--
--all_cairo_private += $(cairo_pthread_private) $(cairo_pthread_headers)
--all_cairo_cxx_sources += $(cairo_pthread_cxx_sources)
--all_cairo_sources += $(cairo_pthread_sources)
--if CAIRO_HAS_PTHREAD
--enabled_cairo_private += $(cairo_pthread_private) $(cairo_pthread_headers)
--enabled_cairo_cxx_sources += $(cairo_pthread_cxx_sources)
--enabled_cairo_sources += $(cairo_pthread_sources)
--endif
--
--supported_cairo_headers += $(cairo_gobject_headers)
--all_cairo_headers += $(cairo_gobject_headers)
--all_cairo_private += $(cairo_gobject_private)
--all_cairo_cxx_sources += $(cairo_gobject_cxx_sources)
--all_cairo_sources += $(cairo_gobject_sources)
--if CAIRO_HAS_GOBJECT_FUNCTIONS
--enabled_cairo_headers += $(cairo_gobject_headers)
--enabled_cairo_private += $(cairo_gobject_private)
--enabled_cairo_cxx_sources += $(cairo_gobject_cxx_sources)
--enabled_cairo_sources += $(cairo_gobject_sources)
--endif
--all_cairo_pkgconf += cairo-gobject.pc
--if CAIRO_HAS_GOBJECT_FUNCTIONS
--enabled_cairo_pkgconf += cairo-gobject.pc
--endif
--
--all_cairo_private += $(cairo_trace_private) $(cairo_trace_headers)
--all_cairo_cxx_sources += $(cairo_trace_cxx_sources)
--all_cairo_sources += $(cairo_trace_sources)
--if CAIRO_HAS_TRACE
--enabled_cairo_private += $(cairo_trace_private) $(cairo_trace_headers)
--enabled_cairo_cxx_sources += $(cairo_trace_cxx_sources)
--enabled_cairo_sources += $(cairo_trace_sources)
--endif
--
--all_cairo_private += $(cairo_interpreter_private) $(cairo_interpreter_headers)
--all_cairo_cxx_sources += $(cairo_interpreter_cxx_sources)
--all_cairo_sources += $(cairo_interpreter_sources)
--if CAIRO_HAS_INTERPRETER
--enabled_cairo_private += $(cairo_interpreter_private) $(cairo_interpreter_headers)
--enabled_cairo_cxx_sources += $(cairo_interpreter_cxx_sources)
--enabled_cairo_sources += $(cairo_interpreter_sources)
--endif
--
--all_cairo_private += $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--all_cairo_cxx_sources += $(cairo_symbol_lookup_cxx_sources)
--all_cairo_sources += $(cairo_symbol_lookup_sources)
--if CAIRO_HAS_SYMBOL_LOOKUP
--enabled_cairo_private += $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--enabled_cairo_cxx_sources += $(cairo_symbol_lookup_cxx_sources)
--enabled_cairo_sources += $(cairo_symbol_lookup_sources)
--endif
-Index: cairo/Makefile.in
-===================================================================
---- cairo.orig/Makefile.in	2010-09-06 23:50:28.963408709 +0200
-+++ cairo/Makefile.in	2010-09-06 23:50:10.423408861 +0200
-@@ -252,6 +252,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -341,6 +342,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -453,7 +455,7 @@
- .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/build/Makefile.am.changelog $(srcdir)/build/Makefile.am.releasing $(srcdir)/build/Makefile.am.analysis $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/build/Makefile.am.changelog $(srcdir)/build/Makefile.am.releasing $(srcdir)/build/Makefile.am.analysis $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -480,9 +482,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	$(am__cd) $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- $(am__aclocal_m4_deps):
- 
-@@ -495,7 +497,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- 	rm -f stamp-h1
- 	touch $@
-Index: cairo/config.h.in
-===================================================================
---- cairo.orig/config.h.in	2010-09-06 23:50:28.919407443 +0200
-+++ cairo/config.h.in	2010-09-06 23:50:06.404407282 +0200
-@@ -23,6 +23,9 @@
- /* Define to 1 to enable cairo's cairo-script-interpreter feature */
- #undef CAIRO_HAS_INTERPRETER
- 
-+/* Define to 1 to enable cairo's cairo-perf-utils feature */
-+#undef CAIRO_HAS_PERF_UTILS
-+
- /* Define to 1 to enable cairo's pthread feature */
- #undef CAIRO_HAS_PTHREAD
- 
-Index: cairo/configure
-===================================================================
---- cairo.orig/configure	2010-09-06 23:50:26.272407257 +0200
-+++ cairo/configure	2010-09-06 23:50:11.723405918 +0200
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for cairo 1.10.0.
-+# Generated by GNU Autoconf 2.67 for cairo 1.10.0.
- #
- # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=cairo>.
- #
-@@ -173,15 +173,7 @@
-   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
--test \$(( 1 + 1 )) = 2 || exit 1
--
--  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
--    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
--    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
--    PATH=/empty FPATH=/empty; export PATH FPATH
--    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
--      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-+test \$(( 1 + 1 )) = 2 || exit 1"
-   if (eval "$as_required") 2>/dev/null; then :
-   as_have_required=yes
- else
-@@ -537,8 +529,155 @@
- # Sed expression to map a string onto a valid variable name.
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
-+
-+
-+# Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
-+case X$lt_ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ;;
-+esac
-+
-+ECHO=${lt_ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<_LT_EOF
-+$*
-+_LT_EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$lt_ECHO"; then
-+  if test "X${echo_test_string+set}" != Xset; then
-+    # find a string as large as possible, as long as the shell can cope with it
-+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-+      then
-+        break
-+      fi
-+    done
-+  fi
-+
-+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+     test "X$echo_testing_string" = "X$echo_test_string"; then
-+    :
-+  else
-+    # The Solaris, AIX, and Digital Unix default echo programs unquote
-+    # backslashes.  This makes it impossible to quote backslashes using
-+    #   echo "$something" | sed 's/\\/\\\\/g'
-+    #
-+    # So, first we look for a working echo in the user's PATH.
-+
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for dir in $PATH /usr/ucb; do
-+      IFS="$lt_save_ifs"
-+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        ECHO="$dir/echo"
-+        break
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+
-+    if test "X$ECHO" = Xecho; then
-+      # We didn't find a better echo, so look for alternatives.
-+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        # This shell has a builtin print -r that does the trick.
-+        ECHO='print -r'
-+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-+        # If we have ksh, try running configure again with it.
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        export ORIGINAL_CONFIG_SHELL
-+        CONFIG_SHELL=/bin/ksh
-+        export CONFIG_SHELL
-+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+      else
-+        # Try using printf.
-+        ECHO='printf %s\n'
-+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  # Cool, printf works
-+	  :
-+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	  export CONFIG_SHELL
-+	  SHELL="$CONFIG_SHELL"
-+	  export SHELL
-+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-+        else
-+	  # maybe with a smaller string...
-+	  prev=:
-+
-+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-+	    then
-+	      break
-+	    fi
-+	    prev="$cmd"
-+	  done
-+
-+	  if test "$prev" != 'sed 50q "$0"'; then
-+	    echo_test_string=`eval $prev`
-+	    export echo_test_string
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	  else
-+	    # Oops.  We lost completely, so just stick with echo.
-+	    ECHO=echo
-+	  fi
-+        fi
-+      fi
-+    fi
-+  fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
-+
- 
- test -n "$DJDIR" || exec 7<&0 </dev/null
- exec 6>&1
-@@ -609,6 +748,8 @@
- am__EXEEXT_TRUE
- LTLIBOBJS
- LIBOBJS
-+CAIRO_HAS_PERF_UTILS_FALSE
-+CAIRO_HAS_PERF_UTILS_TRUE
- HAVE_GTK_FALSE
- HAVE_GTK_TRUE
- gtk_LIBS
-@@ -838,6 +979,7 @@
- LIPO
- NMEDIT
- DSYMUTIL
-+lt_ECHO
- RANLIB
- AR
- LN_S
-@@ -861,6 +1003,9 @@
- build
- AM_BACKSLASH
- AM_DEFAULT_VERBOSITY
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-@@ -945,6 +1090,7 @@
- ac_user_opts='
- enable_option_checking
- enable_dependency_tracking
-+enable_maintainer_mode
- enable_silent_rules
- enable_shared
- enable_static
-@@ -1002,6 +1148,7 @@
- enable_interpreter
- enable_symbol_lookup
- enable_some_floating_point
-+enable_perf_utils
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1127,8 +1274,9 @@
-   fi
- 
-   case $ac_option in
--  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *)	ac_optarg=yes ;;
-+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *=)   ac_optarg= ;;
-+  *)    ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1690,6 +1838,8 @@
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-   --enable-silent-rules          less verbose build output (undo: `make V=1')
-   --disable-silent-rules         verbose build output (undo: `make V=0')
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-@@ -1820,6 +1970,8 @@
-                           option can improve performance on systems without a
-                           double precision floating-point unit, but might
-                           degrade performance on those that do.
-+  --enable-perf-utils=[no/auto/yes]
-+                          Enable cairo's cairo-perf-utils feature [default=no]
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -1990,7 +2142,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- cairo configure 1.10.0
--generated by GNU Autoconf 2.66
-+generated by GNU Autoconf 2.67
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -2062,7 +2214,7 @@
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -2125,7 +2277,7 @@
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -2414,7 +2566,7 @@
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -2769,7 +2921,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by cairo $as_me 1.10.0, which was
--generated by GNU Autoconf 2.66.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -3027,7 +3179,7 @@
-       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "failed to load site script $ac_site_file
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-   fi
- done
- 
-@@ -3417,7 +3569,7 @@
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3532,7 +3684,7 @@
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "C compiler cannot create executables
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -3575,7 +3727,7 @@
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3634,7 +3786,7 @@
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-     fi
-   fi
- fi
-@@ -3686,7 +3838,7 @@
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -3949,7 +4101,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -3965,11 +4117,11 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -4008,7 +4160,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4024,18 +4176,18 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- 
- ac_ext=c
-@@ -4506,11 +4658,11 @@
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -5058,6 +5210,29 @@
- 
- 
- 
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    # Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+   if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+
-+
- # Check whether --enable-silent-rules was given.
- if test "${enable_silent_rules+set}" = set; then :
-   enableval=$enable_silent_rules;
-@@ -5092,7 +5267,7 @@
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -5125,7 +5300,7 @@
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -5144,7 +5319,7 @@
- enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+*-*-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
-@@ -5451,8 +5626,8 @@
- 
- 
- 
--macro_version='2.2.10'
--macro_revision='1.3175'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
- 
- 
- 
-@@ -5468,75 +5643,6 @@
- 
- ltmain="$ac_aux_dir/ltmain.sh"
- 
--# Backslashify metacharacters that are still active within
--# double-quoted strings.
--sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\(["`\\]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
--ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
--$as_echo_n "checking how to print strings... " >&6; }
--# Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
--   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='print -r --'
--elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='printf %s\n'
--else
--  # Use this function as a fallback that always works.
--  func_fallback_echo ()
--  {
--    eval 'cat <<_LTECHO_EOF
--$1
--_LTECHO_EOF'
--  }
--  ECHO='func_fallback_echo'
--fi
--
--# func_echo_all arg...
--# Invoke $ECHO with all args, space-separated.
--func_echo_all ()
--{
--    $ECHO ""
--}
--
--case "$ECHO" in
--  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
--$as_echo "printf" >&6; } ;;
--  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
--$as_echo "print -r" >&6; } ;;
--  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
--$as_echo "cat" >&6; } ;;
--esac
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- { $as_echo "$as_me:${as_lineno-$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 :
-@@ -5872,11 +5978,8 @@
-   NM="$lt_cv_path_NM"
- else
-   # Didn't find any BSD compatible name lister, look for dumpbin.
--  if test -n "$DUMPBIN"; then :
--    # Let the user override the test.
--  else
--    if test -n "$ac_tool_prefix"; then
--  for ac_prog in dumpbin "link -dump"
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5920,7 +6023,7 @@
- fi
- if test -z "$DUMPBIN"; then
-   ac_ct_DUMPBIN=$DUMPBIN
--  for ac_prog in dumpbin "link -dump"
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -5975,15 +6078,6 @@
-   fi
- fi
- 
--    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
--    *COFF*)
--      DUMPBIN="$DUMPBIN -symbols"
--      ;;
--    *)
--      DUMPBIN=:
--      ;;
--    esac
--  fi
- 
-   if test "$DUMPBIN" != ":"; then
-     NM="$DUMPBIN"
-@@ -6003,13 +6097,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6100: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6103: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+  (eval echo "\"\$as_me:6106: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6066,11 +6160,6 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  mint*)
--    # On MiNT this can take a long time and run out of memory.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -6135,8 +6224,8 @@
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
--      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
--	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test $i != 17 # 1/2 MB should be enough
-       do
-         i=`expr $i + 1`
-@@ -6404,18 +6493,16 @@
-   # Base MSYS/MinGW do not provide the 'file' command needed by
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
--  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
--  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+  if ( file / ) >/dev/null 2>&1; then
-     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
--    # Keep this pattern in sync with the one in func_win32_libid.
--    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-     lt_cv_file_magic_cmd='$OBJDUMP -f'
-   fi
-   ;;
- 
--cegcc*)
-+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'
-@@ -6445,10 +6532,6 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--haiku*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -6457,11 +6540,11 @@
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-     ;;
-   hppa*64*)
--    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
-   *)
--    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-     lt_cv_file_magic_test_file=/usr/lib/libc.sl
-     ;;
-   esac
-@@ -6487,7 +6570,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -6899,18 +6982,6 @@
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
--case $host_os in
--  darwin*)
--    lock_old_archive_extraction=yes ;;
--  *)
--    lock_old_archive_extraction=no ;;
--esac
--
--
--
--
--
--
- 
- 
- 
-@@ -7080,8 +7151,8 @@
-   test $ac_status = 0; }; then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
--    if { { eval echo "\"\$as_me\":${as_lineno-$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
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7234,7 +7305,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+  echo '#line 7308 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7946,38 +8017,6 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
- $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
--$as_echo_n "checking for -force_load linker flag... " >&6; }
--if test "${lt_cv_ld_force_load+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  lt_cv_ld_force_load=no
--      cat > conftest.c << _LT_EOF
--int forced_loaded() { return 2;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
--      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
--      echo "$AR cru libconftest.a conftest.o" >&5
--      $AR cru libconftest.a conftest.o 2>&5
--      echo "$RANLIB libconftest.a" >&5
--      $RANLIB libconftest.a 2>&5
--      cat > conftest.c << _LT_EOF
--int main() { return 0;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
--      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
--      _lt_result=$?
--      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
--	lt_cv_ld_force_load=yes
--      else
--	cat conftest.err >&5
--      fi
--        rm -f conftest.err libconftest.a conftest conftest.c
--        rm -rf conftest.dSYM
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
--$as_echo "$lt_cv_ld_force_load" >&6; }
-     case $host_os in
-     rhapsody* | darwin1.[012])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8005,7 +8044,7 @@
-     else
-       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
--    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+    if test "$DSYMUTIL" != ":"; then
-       _lt_dsymutil='~$DSYMUTIL $lib || :'
-     else
-       _lt_dsymutil=
-@@ -8028,8 +8067,6 @@
- 
- 
- 
--
--
- # Set options
- 
- 
-@@ -8180,7 +8217,6 @@
- 
- 
- 
--
- test -z "$LN_S" && LN_S="ln -s"
- 
- 
-@@ -8230,6 +8266,19 @@
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- case $host_os in
- aix3*)
-   # AIX sometimes has problems with the GCC collect2 program.  For some
-@@ -8242,6 +8291,23 @@
-   ;;
- esac
- 
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
- # Global variables:
- ofile=libtool
- can_build_shared=yes
-@@ -8270,7 +8336,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
- # Only perform the check for file, if the check method requires it
-@@ -8479,12 +8545,7 @@
- lt_prog_compiler_no_builtin_flag=
- 
- if test "$GCC" = yes; then
--  case $cc_basename in
--  nvcc*)
--    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
--  *)
--    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
--  esac
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8504,15 +8565,15 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8568: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:8572: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8590,12 +8651,6 @@
-       lt_prog_compiler_pic='-fno-common'
-       ;;
- 
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      lt_prog_compiler_static=
--      ;;
--
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8638,13 +8693,6 @@
-       lt_prog_compiler_pic='-fPIC'
-       ;;
-     esac
--
--    case $cc_basename in
--    nvcc*) # Cuda Compiler Driver 2.2
--      lt_prog_compiler_wl='-Xlinker '
--      lt_prog_compiler_pic='-Xcompiler -fPIC'
--      ;;
--    esac
-   else
-     # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
-@@ -8707,7 +8755,7 @@
- 	lt_prog_compiler_pic='--shared'
- 	lt_prog_compiler_static='--static'
- 	;;
--      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
- 	lt_prog_compiler_wl='-Wl,'
-@@ -8719,26 +8767,26 @@
-         # All Alpha code is PIC.
-         lt_prog_compiler_static='-non_shared'
-         ;;
--      xl* | bgxl* | bgf* | mpixl*)
--	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-qpic'
- 	lt_prog_compiler_static='-qstaticlink'
- 	;;
-       *)
- 	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ F* | *Sun*Fortran*)
--	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
--	  lt_prog_compiler_pic='-KPIC'
--	  lt_prog_compiler_static='-Bstatic'
--	  lt_prog_compiler_wl=''
--	  ;;
- 	*Sun\ C*)
- 	  # Sun C 5.9
- 	  lt_prog_compiler_pic='-KPIC'
- 	  lt_prog_compiler_static='-Bstatic'
- 	  lt_prog_compiler_wl='-Wl,'
- 	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
- 	esac
- 	;;
-       esac
-@@ -8769,7 +8817,7 @@
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-       case $cc_basename in
--      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-+      f77* | f90* | f95*)
- 	lt_prog_compiler_wl='-Qoption ld ';;
-       *)
- 	lt_prog_compiler_wl='-Wl,';;
-@@ -8856,15 +8904,15 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8907: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:8911: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_pic_works=yes
-@@ -8912,7 +8960,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
--       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          lt_cv_prog_compiler_static_works=yes
-@@ -8961,16 +9009,16 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9012: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:9016: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-@@ -9016,16 +9064,16 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9067: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:9071: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-@@ -9135,36 +9183,13 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
-   ld_shlibs=yes
--
--  # On some targets, GNU ld is compatible enough with the native linker
--  # that we're better off using the native interface for both.
--  lt_use_gnu_ld_interface=no
-   if test "$with_gnu_ld" = yes; then
--    case $host_os in
--      aix*)
--	# The AIX port of GNU ld has always aspired to compatibility
--	# with the native linker.  However, as the warning in the GNU ld
--	# block says, versions before 2.19.5* couldn't really create working
--	# shared libraries, regardless of the interface used.
--	case `$LD -v 2>&1` in
--	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
--	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
--	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
--	  *)
--	    lt_use_gnu_ld_interface=yes
--	    ;;
--	esac
--	;;
--      *)
--	lt_use_gnu_ld_interface=yes
--	;;
--    esac
--  fi
--
--  if test "$lt_use_gnu_ld_interface" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-@@ -9198,12 +9223,11 @@
- 	ld_shlibs=no
- 	cat <<_LT_EOF 1>&2
- 
--*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
- *** to be unable to reliably create shared libraries on AIX.
- *** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to install binutils
--*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
--*** You will then need to restart the configuration process.
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
- 
- _LT_EOF
-       fi
-@@ -9239,7 +9263,6 @@
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
--      export_dynamic_flag_spec='${wl}--export-all-symbols'
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
-@@ -9261,11 +9284,6 @@
-       fi
-       ;;
- 
--    haiku*)
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      link_all_deplibs=yes
--      ;;
--
-     interix[3-9]*)
-       hardcode_direct=no
-       hardcode_shlibpath_var=no
-@@ -9295,12 +9313,11 @@
- 	tmp_sharedflag='-shared'
- 	case $cc_basename,$host_cpu in
-         pgcc*)				# Portland Group C compiler
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag'
- 	  ;;
--	pgf77* | pgf90* | pgf95* | pgfortran*)
--					# Portland Group f77 and f90 compilers
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag -Mnomain' ;;
- 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
- 	  tmp_addflag=' -i_dynamic' ;;
-@@ -9311,17 +9328,13 @@
- 	lf95*)				# Lahey Fortran 8.1
- 	  whole_archive_flag_spec=
- 	  tmp_sharedflag='--shared' ;;
--	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
- 	  tmp_sharedflag='-qmkshrobj'
- 	  tmp_addflag= ;;
--	nvcc*)	# Cuda Compiler Driver 2.2
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  compiler_needs_object=yes
--	  ;;
- 	esac
- 	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)			# Sun C 5.9
--	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  compiler_needs_object=yes
- 	  tmp_sharedflag='-G' ;;
- 	*Sun\ F*)			# Sun Fortran 8.3
-@@ -9337,17 +9350,17 @@
-         fi
- 
- 	case $cc_basename in
--	xlf* | bgf* | bgxlf* | mpixlf*)
-+	xlf*)
- 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- 	  hardcode_libdir_flag_spec=
- 	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
--	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- 	  fi
- 	  ;;
- 	esac
-@@ -9356,7 +9369,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -9468,10 +9481,8 @@
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	# Also, AIX nm treats weak defined symbols like other global
--	# defined symbols, whereas GNU nm marks them as "W".
- 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	else
- 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	fi
-@@ -9533,6 +9544,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9589,7 +9601,7 @@
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
- 	if test "$host_cpu" = ia64; then
- 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9633,13 +9645,8 @@
- 	  # -berok will link without error, but may produce a broken library.
- 	  no_undefined_flag=' ${wl}-bernotok'
- 	  allow_undefined_flag=' ${wl}-berok'
--	  if test "$with_gnu_ld" = yes; then
--	    # We only use this code for GNU lds that support --whole-archive.
--	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	  else
--	    # Exported symbols can be pulled into shared objects from archives
--	    whole_archive_flag_spec='$convenience'
--	  fi
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  whole_archive_flag_spec='$convenience'
- 	  archive_cmds_need_lc=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9678,7 +9685,7 @@
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       old_archive_from_new_cmds='true'
-       # FIXME: Should let the user specify the lib program.
-@@ -9694,11 +9701,7 @@
-   hardcode_direct=no
-   hardcode_automatic=yes
-   hardcode_shlibpath_var=unsupported
--  if test "$lt_cv_ld_force_load" = "yes"; then
--    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
--  else
--    whole_archive_flag_spec=''
--  fi
-+  whole_archive_flag_spec=''
-   link_all_deplibs=yes
-   allow_undefined_flag="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -9706,7 +9709,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=func_echo_all
-+    output_verbose_link_cmd=echo
-     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9772,7 +9775,7 @@
-       ;;
- 
-     hpux10*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9791,7 +9794,7 @@
-       ;;
- 
-     hpux11*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case $host_cpu in
- 	hppa*64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9812,46 +9815,7 @@
- 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--
--	  # Older versions of the 11.00 compiler do not understand -b yet
--	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
--	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
--$as_echo_n "checking if $CC understands -b... " >&6; }
--if test "${lt_cv_prog_compiler__b+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  lt_cv_prog_compiler__b=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS -b"
--   echo "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_cv_prog_compiler__b=yes
--       fi
--     else
--       lt_cv_prog_compiler__b=yes
--     fi
--   fi
--   $RM -r conftest*
--   LDFLAGS="$save_LDFLAGS"
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
--$as_echo "$lt_cv_prog_compiler__b" >&6; }
--
--if test x"$lt_cv_prog_compiler__b" = xyes; then
--    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--else
--    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--fi
--
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-@@ -9879,7 +9843,7 @@
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	# Try to use the -exported_symbol ld option, if it does not
- 	# work, assume that -exports_file does not work either and
- 	# implicitly export all symbols.
-@@ -9890,15 +9854,15 @@
- int foo(void) {}
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+  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'
- 
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
-         LDFLAGS="$save_LDFLAGS"
-       else
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
-       archive_cmds_need_lc='no'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9907,7 +9871,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -9960,17 +9924,17 @@
-       hardcode_libdir_flag_spec='-L$libdir'
-       hardcode_minus_L=yes
-       allow_undefined_flag=unsupported
--      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-     osf3*)
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
-       archive_cmds_need_lc='no'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9980,13 +9944,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10189,50 +10153,44 @@
-       # to ld, don't add -lc before -lgcc.
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
--if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  $RM conftest*
--	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } 2>conftest.err; then
--	  soname=conftest
--	  lib=conftest
--	  libobjs=conftest.$ac_objext
--	  deplibs=
--	  wl=$lt_prog_compiler_wl
--	  pic_flag=$lt_prog_compiler_pic
--	  compiler_flags=-v
--	  linker_flags=-v
--	  verstring=
--	  output_objdir=.
--	  libname=conftest
--	  lt_save_allow_undefined_flag=$allow_undefined_flag
--	  allow_undefined_flag=
--	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
--	  then
--	    lt_cv_archive_cmds_need_lc=no
--	  else
--	    lt_cv_archive_cmds_need_lc=yes
--	  fi
--	  allow_undefined_flag=$lt_save_allow_undefined_flag
--	else
--	  cat conftest.err 1>&5
--	fi
--	$RM conftest*
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
--$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
--      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-+        then
-+	  archive_cmds_need_lc=no
-+        else
-+	  archive_cmds_need_lc=yes
-+        fi
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-@@ -10403,23 +10361,16 @@
-     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-     *) lt_awk_arg="/^libraries:/" ;;
-   esac
--  case $host_os in
--    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
--    *) lt_sed_strip_eq="s,=/,/,g" ;;
--  esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
--  case $lt_search_path_spec in
--  *\;*)
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-     # if the path contains ";" then we assume it to be the separator
-     # otherwise default to the standard path separator (i.e. ":") - it is
-     # assumed that no part of a normal pathname contains ";" but that should
-     # okay in the real world where ";" in dirpaths is itself problematic.
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
--    ;;
--  *)
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
--    ;;
--  esac
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-   # Ok, now we have the path, separated by spaces, we can step through it
-   # and add multilib dir if necessary.
-   lt_tmp_lt_search_path_spec=
-@@ -10432,7 +10383,7 @@
- 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
-   done
--  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
- BEGIN {RS=" "; FS="/|\n";} {
-   lt_foo="";
-   lt_count=0;
-@@ -10452,13 +10403,7 @@
-   if (lt_foo != "") { lt_freq[lt_foo]++; }
-   if (lt_freq[lt_foo] == 1) { print lt_foo; }
- }'`
--  # AWK program above erroneously prepends '/' to C:/dos/paths
--  # for these hosts.
--  case $host_os in
--    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
--      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
--  esac
--  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
- else
-   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -10546,7 +10491,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -10599,12 +10544,23 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--
--      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10704,19 +10660,6 @@
-   hardcode_into_libs=yes
-   ;;
- 
--haiku*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  dynamic_linker="$host_os runtime_loader"
--  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=LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
--  hardcode_into_libs=yes
--  ;;
--
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -10759,10 +10702,8 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-   postinstall_cmds='chmod 555 $lib'
--  # or fails outright, so override atomically:
--  install_override_mode=555
-   ;;
- 
- interix[3-9]*)
-@@ -10829,17 +10770,12 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--
-   # Some binutils ld are patched to set DT_RUNPATH
--  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  lt_cv_shlibpath_overrides_runpath=no
--    save_LDFLAGS=$LDFLAGS
--    save_libdir=$libdir
--    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
--	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10852,31 +10788,23 @@
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
--  lt_cv_shlibpath_overrides_runpath=yes
-+  shlibpath_overrides_runpath=yes
- fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--    LDFLAGS=$save_LDFLAGS
--    libdir=$save_libdir
--
--fi
--
--  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # 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;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10888,6 +10816,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -11178,11 +11118,6 @@
- 
- 
- 
--
--
--
--
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action=
-@@ -11513,7 +11448,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line $LINENO "configure"
-+#line 11451 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11554,13 +11489,7 @@
- #  endif
- #endif
- 
--/* When -fvisbility=hidden is used, assume the code has been annotated
--   correspondingly for the symbols needed.  */
--#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
--#endif
--
--void fnord () { int i=42; }
-+void fnord() { int i=42;}
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11569,11 +11498,7 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else
--        {
--	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
--          else puts (dlerror ());
--	}
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-   else
-@@ -11619,7 +11544,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line $LINENO "configure"
-+#line 11547 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11660,13 +11585,7 @@
- #  endif
- #endif
- 
--/* When -fvisbility=hidden is used, assume the code has been annotated
--   correspondingly for the symbols needed.  */
--#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
--#endif
--
--void fnord () { int i=42; }
-+void fnord() { int i=42;}
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11675,11 +11594,7 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else
--        {
--	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
--          else puts (dlerror ());
--	}
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-   else
-@@ -12679,7 +12594,7 @@
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -12960,7 +12875,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -12976,11 +12891,11 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -13019,7 +12934,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -13035,18 +12950,18 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- 
- ac_ext=c
-@@ -13439,7 +13354,392 @@
- fi
- 
- 
--      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CXX" && break
-+done
-+
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$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
-+    CXX=$ac_ct_CXX
-+  fi
-+fi
-+
-+  fi
-+fi
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+else
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+depcc="$CXX"  am_compiler_list=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  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
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # 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
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	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
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj 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 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
-   ac_ext=cpp
-@@ -13480,7 +13780,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -13496,11 +13796,11 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -13539,7 +13839,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -13555,18 +13855,17 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+_lt_caught_CXX_error=yes; }
- fi
- 
- ac_ext=c
-@@ -13579,6 +13878,9 @@
-   _lt_caught_CXX_error=yes
- fi
- 
-+
-+
-+
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -13604,8 +13906,6 @@
- module_expsym_cmds_CXX=
- link_all_deplibs_CXX=unknown
- old_archive_cmds_CXX=$old_archive_cmds
--reload_flag_CXX=$reload_flag
--reload_cmds_CXX=$reload_cmds
- no_undefined_flag_CXX=
- whole_archive_flag_spec_CXX=
- enable_shared_with_static_runtimes_CXX=no
-@@ -13688,7 +13988,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
-   if test -n "$compiler"; then
-@@ -13850,7 +14150,7 @@
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 
-     else
-       GXX=no
-@@ -13992,7 +14292,7 @@
- 
-           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-         else
-           if test "$host_cpu" = ia64; then
- 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -14036,13 +14336,8 @@
- 	    # -berok will link without error, but may produce a broken library.
- 	    no_undefined_flag_CXX=' ${wl}-bernotok'
- 	    allow_undefined_flag_CXX=' ${wl}-berok'
--	    if test "$with_gnu_ld" = yes; then
--	      # We only use this code for GNU lds that support --whole-archive.
--	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	    else
--	      # Exported symbols can be pulled into shared objects from archives
--	      whole_archive_flag_spec_CXX='$convenience'
--	    fi
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec_CXX='$convenience'
- 	    archive_cmds_need_lc_CXX=yes
- 	    # This is similar to how AIX traditionally builds its shared
- 	    # libraries.
-@@ -14075,7 +14370,6 @@
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-         # as there is no search path for DLLs.
-         hardcode_libdir_flag_spec_CXX='-L$libdir'
--        export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-         allow_undefined_flag_CXX=unsupported
-         always_export_symbols_CXX=no
-         enable_shared_with_static_runtimes_CXX=yes
-@@ -14102,11 +14396,7 @@
-   hardcode_direct_CXX=no
-   hardcode_automatic_CXX=yes
-   hardcode_shlibpath_var_CXX=unsupported
--  if test "$lt_cv_ld_force_load" = "yes"; then
--    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
--  else
--    whole_archive_flag_spec_CXX=''
--  fi
-+  whole_archive_flag_spec_CXX=''
-   link_all_deplibs_CXX=yes
-   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -14114,7 +14404,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=func_echo_all
-+    output_verbose_link_cmd=echo
-     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -14167,11 +14457,6 @@
-       gnu*)
-         ;;
- 
--      haiku*)
--        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        link_all_deplibs_CXX=yes
--        ;;
--
-       hpux9*)
-         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-         hardcode_libdir_separator_CXX=:
-@@ -14196,7 +14481,7 @@
-             # explicitly linking system object files so we need to strip them
-             # from the output so that they don't get included in the library
-             # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-             ;;
-           *)
-             if test "$GXX" = yes; then
-@@ -14261,7 +14546,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
-           *)
- 	    if test "$GXX" = yes; then
-@@ -14304,7 +14589,7 @@
-         case $cc_basename in
-           CC*)
- 	    # SGI C++
--	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -14315,9 +14600,9 @@
-           *)
- 	    if test "$GXX" = yes; then
- 	      if test "$with_gnu_ld" = no; then
--	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	      else
--	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
- 	      fi
- 	    fi
- 	    link_all_deplibs_CXX=yes
-@@ -14346,7 +14631,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -14383,26 +14668,26 @@
-           pgCC* | pgcpp*)
-             # Portland Group C++ compiler
- 	    case `$CC -V` in
--	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
- 	      prelink_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
- 	      old_archive_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
- 		$RANLIB $oldlib'
- 	      archive_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
--	    *) # Version 6 and above use weak symbols
-+	    *) # Version 6 will use weak symbols
- 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
-@@ -14410,7 +14695,7 @@
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-             ;;
- 	  cxx*)
- 	    # Compaq C++
-@@ -14429,9 +14714,9 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
--	  xl* | mpixl* | bgxl*)
-+	  xl*)
- 	    # IBM XL 8.0 on PPC, with GNU ld
- 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -14451,13 +14736,13 @@
- 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
--	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	      compiler_needs_object_CXX=yes
- 
- 	      # Not sure whether something based on
- 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- 	      # would be better.
--	      output_verbose_link_cmd='func_echo_all'
-+	      output_verbose_link_cmd='echo'
- 
- 	      # Archives containing C++ object files must be created using
- 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -14526,7 +14811,7 @@
- 	    export_dynamic_flag_spec_CXX='${wl}-E'
- 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- 	  fi
--	  output_verbose_link_cmd=func_echo_all
-+	  output_verbose_link_cmd=echo
- 	else
- 	  ld_shlibs_CXX=no
- 	fi
-@@ -14561,15 +14846,15 @@
- 	    case $host in
- 	      osf3*)
- 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 		;;
- 	      *)
- 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
--	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
- 	          $RM $lib.exp'
- 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- 		;;
-@@ -14585,17 +14870,17 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
- 	  *)
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- 	      case $host in
- 	        osf3*)
--	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	        *)
--	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	      esac
- 
-@@ -14605,7 +14890,7 @@
- 	      # Commands to make compiler produce verbose output that lists
- 	      # what "hidden" libraries, object files and flags are used when
- 	      # linking a shared library.
--	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 
- 	    else
- 	      # FIXME: insert proper C++ library support
-@@ -14641,7 +14926,7 @@
- 
-       solaris*)
-         case $cc_basename in
--          CC* | sunCC*)
-+          CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
-             archive_cmds_need_lc_CXX=yes
- 	    no_undefined_flag_CXX=' -zdefs'
-@@ -14662,7 +14947,7 @@
- 	    esac
- 	    link_all_deplibs_CXX=yes
- 
--	    output_verbose_link_cmd='func_echo_all'
-+	    output_verbose_link_cmd='echo'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -14689,7 +14974,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
-@@ -14700,7 +14985,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 	      fi
- 
- 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -14754,10 +15039,6 @@
-           CC*)
- 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
--	      '"$old_archive_cmds_CXX"
--	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
--	      '"$reload_cmds_CXX"
- 	    ;;
- 	  *)
- 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -14939,7 +15220,7 @@
- 
- solaris*)
-   case $cc_basename in
--  CC* | sunCC*)
-+  CC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -15055,11 +15336,6 @@
-       # DJGPP does not support shared libraries at all
-       lt_prog_compiler_pic_CXX=
-       ;;
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      lt_prog_compiler_static_CXX=
--      ;;
-     interix[3-9]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -15198,8 +15474,8 @@
- 	    lt_prog_compiler_pic_CXX=
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    ;;
--	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
--	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-qpic'
- 	    lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -15229,7 +15505,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15261,7 +15537,7 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC* | sunCC*)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
-@@ -15353,15 +15629,15 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15632: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:15636: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -15406,7 +15682,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
--       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          lt_cv_prog_compiler_static_works_CXX=yes
-@@ -15452,16 +15728,16 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15731: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:15735: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-@@ -15504,16 +15780,16 @@
-    -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:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15783: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:15787: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-@@ -15568,10 +15844,8 @@
-   aix[4-9]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
--    # Also, AIX nm treats weak defined symbols like other global defined
--    # symbols, whereas GNU nm marks them as "W".
-     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     else
-       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     fi
-@@ -15582,6 +15856,9 @@
-   cygwin* | mingw* | cegcc*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -15618,50 +15895,44 @@
-       # to ld, don't add -lc before -lgcc.
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
--if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  $RM conftest*
--	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } 2>conftest.err; then
--	  soname=conftest
--	  lib=conftest
--	  libobjs=conftest.$ac_objext
--	  deplibs=
--	  wl=$lt_prog_compiler_wl_CXX
--	  pic_flag=$lt_prog_compiler_pic_CXX
--	  compiler_flags=-v
--	  linker_flags=-v
--	  verstring=
--	  output_objdir=.
--	  libname=conftest
--	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
--	  allow_undefined_flag_CXX=
--	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_CXX
-+	pic_flag=$lt_prog_compiler_pic_CXX
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+        allow_undefined_flag_CXX=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
--	  then
--	    lt_cv_archive_cmds_need_lc_CXX=no
--	  else
--	    lt_cv_archive_cmds_need_lc_CXX=yes
--	  fi
--	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
--	else
--	  cat conftest.err 1>&5
--	fi
--	$RM conftest*
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
--$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
--      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-+        then
-+	  archive_cmds_need_lc_CXX=no
-+        else
-+	  archive_cmds_need_lc_CXX=yes
-+        fi
-+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-@@ -15818,7 +16089,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -15871,11 +16142,23 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -15974,19 +16257,6 @@
-   hardcode_into_libs=yes
-   ;;
- 
--haiku*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  dynamic_linker="$host_os runtime_loader"
--  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=LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
--  hardcode_into_libs=yes
--  ;;
--
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -16029,10 +16299,8 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-   postinstall_cmds='chmod 555 $lib'
--  # or fails outright, so override atomically:
--  install_override_mode=555
-   ;;
- 
- interix[3-9]*)
-@@ -16099,17 +16367,12 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--
-   # Some binutils ld are patched to set DT_RUNPATH
--  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  lt_cv_shlibpath_overrides_runpath=no
--    save_LDFLAGS=$LDFLAGS
--    save_libdir=$libdir
--    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
--	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -16122,31 +16385,23 @@
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
--  lt_cv_shlibpath_overrides_runpath=yes
-+  shlibpath_overrides_runpath=yes
- fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--    LDFLAGS=$save_LDFLAGS
--    libdir=$save_libdir
--
--fi
--
--  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # 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;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16158,6 +16413,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -16397,8 +16664,6 @@
- 
- 
- 
--
--
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_CXX=
-@@ -17549,7 +17814,7 @@
-      ;; #(
-    *)
-      as_fn_error $? "unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
-  esac
- 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether float word ordering is bigendian" >&5
-@@ -17613,7 +17878,7 @@
- Unknown float word ordering. You need to manually preset
- ax_cv_c_float_words_bigendian=no (or yes) according to your system.
- 
--    " "$LINENO" 5 ;;
-+    " "$LINENO" 5  ;;
- esac
- 
- 
-@@ -17739,7 +18004,7 @@
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (void *)
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_void_p=0
-    fi
-@@ -17772,7 +18037,7 @@
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (int)
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_int=0
-    fi
-@@ -17805,7 +18070,7 @@
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (long)
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_long=0
-    fi
-@@ -17838,7 +18103,7 @@
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (long long)
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_long_long=0
-    fi
-@@ -17871,7 +18136,7 @@
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (size_t)
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_size_t=0
-    fi
-@@ -17927,7 +18192,7 @@
- 
- LIBM=
- case $host in
--*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -19173,7 +19438,7 @@
-   have_x=disabled
- else
-   case $x_includes,$x_libraries in #(
--    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
-     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -19277,7 +19542,7 @@
-   fi
- done
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- fi # $ac_x_includes = no
- 
- if test "$ac_x_libraries" = no; then
-@@ -33551,7 +33816,7 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- 	GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS
- 	GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
-@@ -34583,6 +34848,219 @@
- fi
- 
- 
-+
-+																	# Check whether --enable-perf-utils was given.
-+if test "${enable_perf_utils+set}" = set; then :
-+  enableval=$enable_perf_utils; enable_perf_utils=$enableval
-+else
-+  enable_perf_utils=no
-+fi
-+
-+			case $enable_perf_utils in #(
-+  no) :
-+    		use_perf_utils="no (disabled, use --enable-perf-utils to enable)"
-+	 ;; #(
-+  	yes|auto) :
-+    																																																																if test "x$cairo_cv_perf_utils_cache_version" != "x6" -o \
-+			    "x$cairo_cv_perf_utils_cache_commands_len" != "x18" -o \
-+			    "x$cairo_cv_perf_utils_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then :
-+  unset cairo_cv_perf_utils_use
-+fi
-+		if test "x$enable_perf_utils" = xyes -a "x$cairo_cv_perf_utils_use" != xyes; then :
-+  unset cairo_cv_perf_utils_use
-+fi
-+
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo's cairo-perf-utils feature" >&5
-+$as_echo_n "checking for cairo's cairo-perf-utils feature... " >&6; }
-+if test "${cairo_cv_perf_utils_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  			echo
-+			use_perf_utils=yes
-+				perf_utils_BASE="cairo"
-+perf_utils_REQUIRES="$ac_env_perf_utils_REQUIRES_value"
-+perf_utils_CFLAGS="$ac_env_perf_utils_CFLAGS_value"
-+perf_utils_NONPKGCONFIG_CFLAGS="$ac_env_perf_utils_NONPKGCONFIG_CFLAGS_value"
-+perf_utils_LIBS="$ac_env_perf_utils_LIBS_value"
-+perf_utils_NONPKGCONFIG_LIBS="$ac_env_perf_utils_NONPKGCONFIG_LIBS_value"
-+perf_utils_NONPKGCONFIG_EXTRA_LIBS="$ac_env_perf_utils_NONPKGCONFIG_EXTRA_LIBS_value"
-+
-+			use_perf_utils=yes
-+			cairo_cv_perf_utils_use=$use_perf_utils
-+			cairo_cv_perf_utils_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
-+			cairo_cv_perf_utils_cache_commands_len="18"
-+			cairo_cv_perf_utils_cache_version="6"
-+				cairo_cv_perf_utils_BASE=$perf_utils_BASE
-+cairo_cv_perf_utils_REQUIRES=$perf_utils_REQUIRES
-+cairo_cv_perf_utils_CFLAGS=$perf_utils_CFLAGS
-+cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS=$perf_utils_NONPKGCONFIG_CFLAGS
-+cairo_cv_perf_utils_LIBS=$perf_utils_LIBS
-+cairo_cv_perf_utils_NONPKGCONFIG_LIBS=$perf_utils_NONPKGCONFIG_LIBS
-+cairo_cv_perf_utils_NONPKGCONFIG_EXTRA_LIBS=$perf_utils_NONPKGCONFIG_EXTRA_LIBS
-+
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's cairo-perf-utils feature could be enabled" >&5
-+$as_echo_n "checking whether cairo's cairo-perf-utils feature could be enabled... " >&6; }
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cairo_cv_perf_utils_use" >&5
-+$as_echo "$cairo_cv_perf_utils_use" >&6; }
-+		use_perf_utils=$cairo_cv_perf_utils_use
-+
-+		if test "x$enable_perf_utils" = "xyes" -a "x$use_perf_utils" != xyes; then :
-+  			as_fn_error $? " cairo-perf-utils feature could not be enabled" "$LINENO" 5
-+
-+fi	 ;; #(
-+  *) :
-+    			as_fn_error $? "invalid argument passed to --enable-perf-utils: \`$use_perf_utils', should be one of [no/auto/yes]" "$LINENO" 5
-+	 ;;
-+esac
-+	if test "x$use_perf_utils" = "xyes"; then :
-+  			perf_utils_BASE=$cairo_cv_perf_utils_BASE
-+perf_utils_REQUIRES=$cairo_cv_perf_utils_REQUIRES
-+perf_utils_CFLAGS=$cairo_cv_perf_utils_CFLAGS
-+perf_utils_NONPKGCONFIG_CFLAGS=$cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS
-+perf_utils_LIBS=$cairo_cv_perf_utils_LIBS
-+perf_utils_NONPKGCONFIG_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_LIBS
-+perf_utils_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_EXTRA_LIBS
-+
-+								        	CAIRO_REQUIRES="$perf_utils_REQUIRES"" ${CAIRO_REQUIRES}"
-+
-+							        	CAIRO_CFLAGS="$perf_utils_CFLAGS"" ${CAIRO_CFLAGS}"
-+
-+							        	CAIRO_NONPKGCONFIG_CFLAGS="$perf_utils_NONPKGCONFIG_CFLAGS"" ${CAIRO_NONPKGCONFIG_CFLAGS}"
-+
-+							        	CAIRO_LIBS="$perf_utils_LIBS"" ${CAIRO_LIBS}"
-+
-+							        	CAIRO_NONPKGCONFIG_LIBS="$perf_utils_NONPKGCONFIG_LIBS"" ${CAIRO_NONPKGCONFIG_LIBS}"
-+
-+
-+else
-+  					perf_utils_BASE=$cairo_cv_perf_utils_BASE
-+perf_utils_REQUIRES=$cairo_cv_perf_utils_REQUIRES
-+perf_utils_CFLAGS=$cairo_cv_perf_utils_CFLAGS
-+perf_utils_NONPKGCONFIG_CFLAGS=$cairo_cv_perf_utils_NONPKGCONFIG_CFLAGS
-+perf_utils_LIBS=$cairo_cv_perf_utils_LIBS
-+perf_utils_NONPKGCONFIG_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_LIBS
-+perf_utils_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_perf_utils_NONPKGCONFIG_EXTRA_LIBS
-+
-+
-+fi
-+
-+							 if test "x$use_perf_utils" = xyes; then
-+  CAIRO_HAS_PERF_UTILS_TRUE=
-+  CAIRO_HAS_PERF_UTILS_FALSE='#'
-+else
-+  CAIRO_HAS_PERF_UTILS_TRUE='#'
-+  CAIRO_HAS_PERF_UTILS_FALSE=
-+fi
-+
-+
-+										cr_make_tmp='CAIRO_HAS_PERF_UTILS=0'
-+												        	CAIRO_MAKEFILE___WIN32="${CAIRO_MAKEFILE___WIN32}
-+""$cr_make_tmp"
-+
-+
-+										cr_make_tmp=''
-+									        	CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
-+""$cr_make_tmp"
-+
-+												        	CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
-+""$cr_make_tmp"
-+										cr_make_tmp=''
-+									        	CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
-+""$cr_make_tmp"
-+
-+												        	CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
-+""$cr_make_tmp"
-+
-+
-+
-+
-+
-+
-+										cr_make_tmp='all_cairo_private += $(cairo_perf_utils_private) $(cairo_perf_utils_headers)
-+all_cairo_cxx_sources += $(cairo_perf_utils_cxx_sources)
-+all_cairo_sources += $(cairo_perf_utils_sources)'
-+									        	CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
-+""$cr_make_tmp"
-+
-+												        	CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
-+""$cr_make_tmp"
-+										cr_make_tmp='all_cairo_boilerplate_private += $(cairo_boilerplate_perf_utils_private) $(cairo_boilerplate_perf_utils_headers)
-+all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_perf_utils_cxx_sources)
-+all_cairo_boilerplate_sources += $(cairo_boilerplate_perf_utils_sources)'
-+									        	CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
-+""$cr_make_tmp"
-+
-+												        	CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
-+""$cr_make_tmp"
-+
-+
-+										cr_make_tmp='enabled_cairo_private += $(cairo_perf_utils_private) $(cairo_perf_utils_headers)
-+enabled_cairo_cxx_sources += $(cairo_perf_utils_cxx_sources)
-+enabled_cairo_sources += $(cairo_perf_utils_sources)'
-+								        	CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
-+"'if CAIRO_HAS_PERF_UTILS'
-+			        	CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
-+""$cr_make_tmp"
-+			        	CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE}
-+"'endif'
-+
-+											        	CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
-+"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
-+			        	CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
-+""$cr_make_tmp"
-+			        	CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32}
-+"'endif'
-+									cr_make_tmp='enabled_cairo_boilerplate_private += $(cairo_boilerplate_perf_utils_private) $(cairo_boilerplate_perf_utils_headers)
-+enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_perf_utils_cxx_sources)
-+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_perf_utils_sources)'
-+								        	CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
-+"'if CAIRO_HAS_PERF_UTILS'
-+			        	CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
-+""$cr_make_tmp"
-+			        	CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE}
-+"'endif'
-+
-+											        	CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
-+"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
-+			        	CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
-+""$cr_make_tmp"
-+			        	CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32}
-+"'endif'
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+					if test "x$use_perf_utils" = xyes; then :
-+  :
-+
-+$as_echo "#define CAIRO_HAS_PERF_UTILS 1" >>confdefs.h
-+
-+
-+
-+fi
-+										cr_make_tmp='	@echo "#define CAIRO_HAS_PERF_UTILS 1" >> src/cairo-features.h'
-+											        	CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
-+"'ifeq ($(CAIRO_HAS_PERF_UTILS),1)'
-+			        	CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
-+""$cr_make_tmp"
-+			        	CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32}
-+"'endif'
-+
-+
-+
-+
-+
-+
-+
-+
-+
- ac_config_files="$ac_config_files Makefile boilerplate/Makefile src/Makefile test/Makefile test/pdiff/Makefile perf/Makefile util/Makefile util/cairo-fdr/Makefile util/cairo-gobject/Makefile util/cairo-script/Makefile util/cairo-script/examples/Makefile util/cairo-sphinx/Makefile util/cairo-trace/Makefile util/cairo-trace/cairo-trace doc/Makefile doc/public/Makefile"
- 
- 
-@@ -34700,6 +35178,10 @@
-   am__EXEEXT_FALSE=
- fi
- 
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -34712,6 +35194,10 @@
-   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- CAIRO_CFLAGS="$CAIRO_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS"
- CAIRO_LIBS="$CAIRO_LIBS $CAIRO_NONPKGCONFIG_LIBS"
- 
-@@ -34985,6 +35471,10 @@
-   as_fn_error $? "conditional \"HAVE_GTK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${CAIRO_HAS_PERF_UTILS_TRUE}" && test -z "${CAIRO_HAS_PERF_UTILS_FALSE}"; then
-+  as_fn_error $? "conditional \"CAIRO_HAS_PERF_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
-@@ -35394,7 +35884,7 @@
- # values after options handling.
- ac_log="
- This file was extended by cairo $as_me 1.10.0, which was
--generated by GNU Autoconf 2.66.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -35460,7 +35950,7 @@
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- cairo config.status 1.10.0
--configured by $0, generated by GNU Autoconf 2.66,
-+configured by $0, generated by GNU Autoconf 2.67,
-   with options \\"\$ac_cs_config\\"
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -35481,11 +35971,16 @@
- while test $# != 0
- do
-   case $1 in
--  --*=*)
-+  --*=?*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
-+  --*=)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=
-+    ac_shift=:
-+    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -35507,6 +36002,7 @@
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -35582,203 +36078,186 @@
- sed_quote_subst='$sed_quote_subst'
- double_quote_subst='$double_quote_subst'
- delay_variable_subst='$delay_variable_subst'
--AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
--DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
--OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
--macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
--macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
--enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
--enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
--pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
--enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
--SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
--ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
--host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
--host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
--host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
--build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
--build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
--build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
--SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
--Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
--GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
--EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
--FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
--LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
--NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
--LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
--max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
--ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
--exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
--lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
--lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
--lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
--reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
--reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
--deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
--file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
--AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
--AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
--STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
--RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
--old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
--old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
--old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
--lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
--CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
--CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
--compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
--GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
--objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
--MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
--lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
--need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
--DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
--NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
--LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
--OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
--OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
--libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
--shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
--extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
--archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
--enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
--export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
--whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
--compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
--old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
--old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
--archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
--archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
--module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
--module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
--with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
--allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
--no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
--hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
--hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
--hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
--hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
--hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
--inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
--link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
--fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
--always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
--export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
--exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
--include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
--prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
--file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
--variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
--need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
--need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
--version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
--runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
--shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
--shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
--libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
--library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
--soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
--install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
--postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
--postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
--finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
--finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
--hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
--sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
--sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
--hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
--enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
--enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
--enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
--old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
--striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
--compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
--predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
--postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
--predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
--postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
--compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
--LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
--reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
--reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
--GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
--lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
--archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
--enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
--export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
--whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
--compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
--old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
--allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
--no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
--inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
--link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
--fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
--always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
--export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
--include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
--prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
--file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
--hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
--compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
--predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
--postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
--predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
--postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
--compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
-+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
- 
- LTCC='$LTCC'
- LTCFLAGS='$LTCFLAGS'
- compiler='$compiler_DEFAULT'
- 
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--\$1
--_LTECHO_EOF'
--}
--
- # Quote evaled strings.
--for var in AS \
--DLLTOOL \
--OBJDUMP \
--SHELL \
--ECHO \
--SED \
-+for var in SED \
- GREP \
- EGREP \
- FGREP \
-@@ -35801,6 +36280,8 @@
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-+SHELL \
-+ECHO \
- lt_prog_compiler_no_builtin_flag \
- lt_prog_compiler_wl \
- lt_prog_compiler_pic \
-@@ -35830,7 +36311,6 @@
- libname_spec \
- library_names_spec \
- soname_spec \
--install_override_mode \
- finish_eval \
- old_striplib \
- striplib \
-@@ -35841,7 +36321,6 @@
- postdeps \
- compiler_lib_search_path \
- LD_CXX \
--reload_flag_CXX \
- compiler_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- lt_prog_compiler_wl_CXX \
-@@ -35867,9 +36346,9 @@
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX; do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-     *[\\\\\\\`\\"\\\$]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -35896,7 +36375,6 @@
- finish_cmds \
- sys_lib_search_path_spec \
- sys_lib_dlsearch_path_spec \
--reload_cmds_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
-@@ -35906,9 +36384,9 @@
- module_expsym_cmds_CXX \
- export_symbols_cmds_CXX \
- prelink_cmds_CXX; do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-     *[\\\\\\\`\\"\\\$]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -35916,6 +36394,12 @@
-     esac
- done
- 
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-+  ;;
-+esac
-+
- ac_aux_dir='$ac_aux_dir'
- xsi_shell='$xsi_shell'
- lt_shell_append='$lt_shell_append'
-@@ -36531,7 +37015,7 @@
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-     "doc/public/Makefile") CONFIG_FILES="$CONFIG_FILES doc/public/Makefile" ;;
- 
--  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-   esac
- done
- 
-@@ -36847,7 +37331,7 @@
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -36875,7 +37359,7 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -36902,7 +37386,7 @@
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-     esac
-     ;;
-   esac
-@@ -37238,8 +37722,7 @@
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -37272,13 +37755,13 @@
- # ### BEGIN LIBTOOL CONFIG
- 
- # Assembler program.
--AS=$lt_AS
-+AS=$AS
- 
- # DLL creation program.
--DLLTOOL=$lt_DLLTOOL
-+DLLTOOL=$DLLTOOL
- 
- # Object dumper program.
--OBJDUMP=$lt_OBJDUMP
-+OBJDUMP=$OBJDUMP
- 
- # Which release of libtool.m4 was used?
- macro_version=$macro_version
-@@ -37296,12 +37779,6 @@
- # Whether or not to optimize for fast installation.
- fast_install=$enable_fast_install
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# An echo program that protects backslashes.
--ECHO=$lt_ECHO
--
- # The host system.
- host_alias=$host_alias
- host=$host
-@@ -37351,6 +37828,10 @@
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
- 
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
- 
-@@ -37369,9 +37850,6 @@
- old_postinstall_cmds=$lt_old_postinstall_cmds
- old_postuninstall_cmds=$lt_old_postuninstall_cmds
- 
--# Whether to use a lock for old archive extraction.
--lock_old_archive_extraction=$lock_old_archive_extraction
--
- # A C compiler.
- LTCC=$lt_CC
- 
-@@ -37393,6 +37871,12 @@
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
- 
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# An echo program that does not interpret backslashes.
-+ECHO=$lt_ECHO
-+
- # Used to examine libraries when file_magic_cmd begins with "file".
- MAGIC_CMD=$MAGIC_CMD
- 
-@@ -37455,9 +37939,6 @@
- # The coded name of the library, if different from the real name.
- soname_spec=$lt_soname_spec
- 
--# Permission mode override for installation of shared libraries.
--install_override_mode=$lt_install_override_mode
--
- # Command to use after installation of a shared archive.
- postinstall_cmds=$lt_postinstall_cmds
- 
-@@ -37497,10 +37978,6 @@
- # The linker used to build libraries.
- LD=$lt_LD
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
- # Commands used to build an old-style archive.
- old_archive_cmds=$lt_old_archive_cmds
- 
-@@ -37774,7 +38251,7 @@
- func_dirname ()
- {
-   # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-   if test "X$func_dirname_result" = "X${1}"; then
-     func_dirname_result="${3}"
-   else
-@@ -37785,7 +38262,7 @@
- # func_basename file
- func_basename ()
- {
--  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
- 
- 
-@@ -37798,8 +38275,10 @@
- func_stripname ()
- {
-   case ${2} in
--    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-   esac
- }
- 
-@@ -37810,20 +38289,20 @@
- # func_opt_split
- func_opt_split ()
- {
--  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
- }
- 
- # func_lo2o object
- func_lo2o ()
- {
--  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
- }
- 
- # func_xform libobj-or-source
- func_xform ()
- {
--  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
- }
- 
- # func_arith arithmetic-term...
-@@ -37884,10 +38363,6 @@
- # The linker used to build libraries.
- LD=$lt_LD_CXX
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag_CXX
--reload_cmds=$lt_reload_cmds_CXX
--
- # Commands used to build an old-style archive.
- old_archive_cmds=$lt_old_archive_cmds_CXX
- 
-@@ -38569,6 +39044,7 @@
- 	echo "The following features and utilities:"
- 	echo "  cairo-trace:                $use_trace"
- 	echo "  cairo-script-interpreter:   $use_interpreter"
-+	echo "  cairo-perf-utils:           $use_perf_utils"
- 	echo ""
- 	echo "And the following internal features:"
- 	echo "  pthread:       $use_pthread"
-Index: cairo/perf/Makefile.in
-===================================================================
---- cairo.orig/perf/Makefile.in	2010-09-06 23:50:29.043415527 +0200
-+++ cairo/perf/Makefile.in	2010-09-06 23:50:07.775406035 +0200
-@@ -14,6 +14,7 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
-+
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -41,12 +42,20 @@
- 	cairo-perf-graph-files$(EXEEXT)
- TESTS =
- check_PROGRAMS =
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_1 = cairo-perf-win32.c
--@CAIRO_HAS_OS2_SURFACE_TRUE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_2 = cairo-perf-os2.c
--@CAIRO_HAS_OS2_SURFACE_FALSE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_3 = cairo-perf-posix.c
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_4 = cairo-perf-win32.c
--@CAIRO_HAS_OS2_SURFACE_TRUE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_5 = cairo-perf-os2.c
--@CAIRO_HAS_OS2_SURFACE_FALSE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_6 = cairo-perf-posix.c
-+@CAIRO_HAS_PERF_UTILS_TRUE@bin_PROGRAMS = cairo-perf-micro$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	cairo-perf-trace$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	cairo-perf-diff-files$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	cairo-perf-print$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	cairo-perf-chart$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	cairo-perf-compare-backends$(EXEEXT) \
-+@CAIRO_HAS_PERF_UTILS_TRUE@	$(am__EXEEXT_1)
-+@CAIRO_HAS_PERF_UTILS_TRUE@@HAVE_GTK_TRUE@am__append_1 = cairo-perf-graph-files
-+@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_2 = cairo-perf-win32.c
-+@CAIRO_HAS_OS2_SURFACE_TRUE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_3 = cairo-perf-os2.c
-+@CAIRO_HAS_OS2_SURFACE_FALSE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_4 = cairo-perf-posix.c
-+@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_5 = cairo-perf-win32.c
-+@CAIRO_HAS_OS2_SURFACE_TRUE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_6 = cairo-perf-os2.c
-+@CAIRO_HAS_OS2_SURFACE_FALSE@@CAIRO_HAS_WIN32_SURFACE_FALSE@am__append_7 = cairo-perf-posix.c
- subdir = perf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -83,6 +92,9 @@
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
- am__v_lt_0 = --silent
-+@CAIRO_HAS_PERF_UTILS_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_1 = cairo-perf-graph-files$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+PROGRAMS = $(bin_PROGRAMS)
- am_cairo_perf_chart_OBJECTS = cairo-perf-chart.$(OBJEXT)
- cairo_perf_chart_OBJECTS = $(am_cairo_perf_chart_OBJECTS)
- cairo_perf_chart_LDADD = $(LDADD)
-@@ -284,6 +296,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -373,6 +386,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -447,7 +461,7 @@
- 	micro/world-map.c micro/world-map.h micro/zrusin.c \
- 	micro/zrusin-another.h micro/long-dashed-lines.c \
- 	micro/dragon.c micro/pythagoras-tree.c micro/intersections.c \
--	micro/spiral.c $(am__append_1) $(am__append_2) $(am__append_3)
-+	micro/spiral.c $(am__append_2) $(am__append_3) $(am__append_4)
- cairo_perf_micro_LDADD = $(LDADD)
- cairo_perf_micro_DEPENDENCIES = \
-         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
-@@ -460,7 +474,7 @@
- 	cairo-stats.h
- 
- cairo_perf_trace_SOURCES = cairo-perf-trace.c ../src/cairo-hash.c \
--	$(am__append_4) $(am__append_5) $(am__append_6)
-+	$(am__append_5) $(am__append_6) $(am__append_7)
- cairo_perf_trace_LDADD = \
- 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
- 	$(LDADD)
-@@ -512,7 +526,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -537,13 +551,56 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- libcairoperf.la: $(libcairoperf_la_OBJECTS) $(libcairoperf_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(LINK)  $(libcairoperf_la_OBJECTS) $(libcairoperf_la_LIBADD) $(LIBS)
-+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
-+
-+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
-+
-+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
- 
- clean-checkPROGRAMS:
- 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-@@ -1295,8 +1352,11 @@
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
- check: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) check-am
--all-am: Makefile
-+all-am: Makefile $(PROGRAMS)
- installdirs:
-+	for dir in "$(DESTDIR)$(bindir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
-@@ -1329,8 +1389,8 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- clean: clean-am
- 
--clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
--	mostlyclean-am
-+clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-+	clean-libtool mostlyclean-am
- 
- distclean: distclean-am
- 	-rm -rf ./$(DEPDIR)
-@@ -1356,7 +1416,7 @@
- 
- install-dvi-am:
- 
--install-exec-am:
-+install-exec-am: install-binPROGRAMS
- 
- install-html: install-html-am
- 
-@@ -1396,23 +1456,24 @@
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-binPROGRAMS
- 
- .MAKE: all check check-am install install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
--	clean-checkPROGRAMS clean-generic clean-libtool ctags \
--	distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
--	html-am html-local info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
--	install-info install-info-am install-man install-pdf \
--	install-pdf-am install-ps install-ps-am install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am
-+	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-+	clean-libtool ctags distclean distclean-compile \
-+	distclean-generic distclean-libtool distclean-tags distdir dvi \
-+	dvi-am html html-am html-local info info-am install install-am \
-+	install-binPROGRAMS install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-binPROGRAMS
- 
- 
- # Install rules to rebuild the libraries and add explicit dependencies
-Index: cairo/src/Makefile.in
-===================================================================
---- cairo.orig/src/Makefile.in	2010-09-06 23:50:28.215418729 +0200
-+++ cairo/src/Makefile.in	2010-09-06 23:50:07.892407151 +0200
-@@ -17,59 +17,6 @@
- 
- # Note: All source files are listed in Makefile.sources.
- 
--# Generated by configure.  Do not edit.
--
--# Makefile.sources
--#
--# This file is the canonical location listing all the source files used
--# to build the cairo library.  Every source file is categorized as one of:
--#
--#   * public header file
--#   * private header file (must end in -private.h except for cairoint.h)
--#   * source code file
--#
--# Every source file should be specified exactly once, grouped with the
--# feature that uses the source file.  If more than one feature use the
--# file (like pdf_operators or font_subset files), the files should be
--# appended to to the base cairo files, and the code inside them
--# enabled/disabled using C preprocessor macros defined in cairoint.h.
--# See how pdf_operators or font_subset are handled.
--#
--# The sources are picked up according to the configured features
--# by the generated file Makefile.am.features or Makefile.win32.features.
--#
--# These are a few special source files.  Those are not included in this
--# file to not confuse build systems.  Each build system must handle them
--# separately.  These files include:
--#
--#   * cairo-features.h:
--#     This file is generated by configure and includes macros signifying
--#     which features are enabled.  This file should be installed like
--#     other public headers, but should NOT be distributed in the cairo
--#     distribution.
--#
--#   * cairo-version.h:
--#     This is a dummy header file used during the build, but it should
--#     NOT be installed.  Its sole purpose is to make sure changes in the
--#     cairo version do not trigger a full rebuild of the library, but
--#     just the functions actually using the version information.
--#
--#   * $(top_srcdir)/cairo-version.h:
--#     This is the real file holding the cairo version number.  This file
--#     should be installed like other public headers.  This is used during
--#     the build by cairo-version.c only.
--#
--#   * cairo-supported-features.h:
--#     This file is generated by configure and includes macros signifying
--#     all supported features.  This is used by gtk-doc to generate
--#     documentation for all those macros, enabled or not.
--#     This file is NOT used during the build of the library and should
--#     NOT be installed or distributed.
--#
--# Please follow the strict syntax of this file, including keeping file
--# lists sorted.
--#
--
- 
- 
- VPATH = @srcdir@
-@@ -91,207 +38,14 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--DIST_COMMON = README $(am__cairoinclude_HEADERS_DIST) \
--	$(srcdir)/Makefile.am $(srcdir)/Makefile.am.analysis \
--	$(srcdir)/Makefile.am.features $(srcdir)/Makefile.in \
--	$(srcdir)/cairo-features.pc.in $(srcdir)/cairo.pc.in \
--	$(top_srcdir)/build/Makefile.am.common \
--	$(top_srcdir)/src/Makefile.sources
-+DIST_COMMON = README $(cairoinclude_HEADERS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.am.analysis $(srcdir)/Makefile.am.features \
-+	$(srcdir)/Makefile.in $(srcdir)/cairo-features.pc.in \
-+	$(srcdir)/cairo.pc.in $(top_srcdir)/build/Makefile.am.common
- EXTRA_PROGRAMS =
--TESTS = $(am__EXEEXT_1) $(am__append_188)
-+TESTS = $(am__EXEEXT_1) $(am__append_1)
- check_PROGRAMS = check-link$(EXEEXT)
--@BUILD_XCB_SHM_TRUE@am__append_1 = \
--@BUILD_XCB_SHM_TRUE@		    cairo-xcb-shm.c \
--@BUILD_XCB_SHM_TRUE@		    cairo-xcb-connection-shm.c \
--@BUILD_XCB_SHM_TRUE@		    $(NULL)
--
--@BUILD_PRIVATE_GLEW_TRUE@am__append_2 = glew/glew.c
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_3 = $(cairo_xlib_headers)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_4 = $(cairo_xlib_private)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_5 = $(cairo_xlib_cxx_sources)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_6 = $(cairo_xlib_sources)
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_7 = cairo-xlib.pc
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_8 = $(cairo_xlib_xrender_headers)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_9 = $(cairo_xlib_xrender_private)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_10 = $(cairo_xlib_xrender_cxx_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_11 = $(cairo_xlib_xrender_sources)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_12 = cairo-xlib-xrender.pc
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_13 = $(cairo_xcb_headers)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_14 = $(cairo_xcb_private)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_15 = $(cairo_xcb_cxx_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_16 = $(cairo_xcb_sources)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_17 = cairo-xcb.pc
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_18 = $(cairo_xlib_xcb_headers)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_19 = $(cairo_xlib_xcb_private)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_20 = $(cairo_xlib_xcb_cxx_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_21 = $(cairo_xlib_xcb_sources)
--@CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE@am__append_22 = cairo-xlib-xcb.pc
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_23 = $(cairo_xcb_shm_headers)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_24 = $(cairo_xcb_shm_private)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_25 = $(cairo_xcb_shm_cxx_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_26 = $(cairo_xcb_shm_sources)
--@CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE@am__append_27 = cairo-xcb-shm.pc
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_28 = $(cairo_qt_headers)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_29 = $(cairo_qt_private)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_30 = $(cairo_qt_cxx_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_31 = $(cairo_qt_sources)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__append_32 = cairo-qt.pc
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_33 = $(cairo_quartz_headers)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_34 = $(cairo_quartz_private)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_35 = $(cairo_quartz_cxx_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_36 = $(cairo_quartz_sources)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_37 = cairo-quartz.pc
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_38 = $(cairo_quartz_font_headers)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_39 = $(cairo_quartz_font_private)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_40 = $(cairo_quartz_font_cxx_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_41 = $(cairo_quartz_font_sources)
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_42 = cairo-quartz-font.pc
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_43 = $(cairo_quartz_image_headers)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_44 = $(cairo_quartz_image_private)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_45 = $(cairo_quartz_image_cxx_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_46 = $(cairo_quartz_image_sources)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_47 = cairo-quartz-image.pc
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_48 = $(cairo_win32_headers)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_49 = $(cairo_win32_private)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_50 = $(cairo_win32_cxx_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_51 = $(cairo_win32_sources)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_52 = cairo-win32.pc
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_53 = $(cairo_win32_font_headers)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_54 = $(cairo_win32_font_private)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_55 = $(cairo_win32_font_cxx_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_56 = $(cairo_win32_font_sources)
--@CAIRO_HAS_WIN32_FONT_TRUE@am__append_57 = cairo-win32-font.pc
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_58 = $(cairo_skia_headers)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_59 = $(cairo_skia_private)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_60 = $(cairo_skia_cxx_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_61 = $(cairo_skia_sources)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__append_62 = cairo-skia.pc
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_63 = $(cairo_os2_headers)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_64 = $(cairo_os2_private)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_65 = $(cairo_os2_cxx_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_66 = $(cairo_os2_sources)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_67 = cairo-os2.pc
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_68 = $(cairo_beos_headers)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_69 = $(cairo_beos_private)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_70 = $(cairo_beos_cxx_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_71 = $(cairo_beos_sources)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_72 = cairo-beos.pc
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_73 = $(cairo_drm_headers)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_74 = $(cairo_drm_private)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_75 = $(cairo_drm_cxx_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_76 = $(cairo_drm_sources)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__append_77 = cairo-drm.pc
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_78 = $(cairo_drm_xr_headers)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_79 = $(cairo_drm_xr_private)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_80 = $(cairo_drm_xr_cxx_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_81 = $(cairo_drm_xr_sources)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__append_82 = cairo-drm-xr.pc
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_83 = $(cairo_gallium_headers)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_84 = $(cairo_gallium_private)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_85 = $(cairo_gallium_cxx_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_86 = $(cairo_gallium_sources)
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__append_87 = cairo-gallium.pc
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_88 = $(cairo_xcb_drm_headers)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_89 = $(cairo_xcb_drm_private)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_90 = $(cairo_xcb_drm_cxx_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_91 = $(cairo_xcb_drm_sources)
--@CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE@am__append_92 = cairo-xcb-drm.pc
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_93 = $(cairo_png_headers)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_94 = $(cairo_png_private)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_95 = $(cairo_png_cxx_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_96 = $(cairo_png_sources)
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_97 = cairo-png.pc
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_98 = $(cairo_gl_headers)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_99 = $(cairo_gl_private)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_100 = $(cairo_gl_cxx_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_101 = $(cairo_gl_sources)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__append_102 = cairo-gl.pc
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_103 = $(cairo_directfb_headers)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_104 = $(cairo_directfb_private)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_105 = $(cairo_directfb_cxx_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_106 = $(cairo_directfb_sources)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_107 = cairo-directfb.pc
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_108 = $(cairo_vg_headers)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_109 = $(cairo_vg_private)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_110 = $(cairo_vg_cxx_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_111 = $(cairo_vg_sources)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__append_112 = cairo-vg.pc
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_113 = $(cairo_egl_headers)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_114 = $(cairo_egl_private)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_115 = $(cairo_egl_cxx_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_116 = $(cairo_egl_sources)
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__append_117 = cairo-egl.pc
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_118 = $(cairo_glx_headers)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_119 = $(cairo_glx_private)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_120 = $(cairo_glx_cxx_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_121 = $(cairo_glx_sources)
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__append_122 = cairo-glx.pc
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_123 = $(cairo_wgl_headers)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_124 = $(cairo_wgl_private)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_125 = $(cairo_wgl_cxx_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_126 = $(cairo_wgl_sources)
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__append_127 = cairo-wgl.pc
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_128 = $(cairo_script_headers)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_129 = $(cairo_script_private)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_130 = $(cairo_script_cxx_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_131 = $(cairo_script_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_132 = cairo-script.pc
--@CAIRO_HAS_FT_FONT_TRUE@am__append_133 = $(cairo_ft_headers)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_134 = $(cairo_ft_private)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_135 = $(cairo_ft_cxx_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_136 = $(cairo_ft_sources)
--@CAIRO_HAS_FT_FONT_TRUE@am__append_137 = cairo-ft.pc
--@CAIRO_HAS_FC_FONT_TRUE@am__append_138 = $(cairo_fc_headers)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_139 = $(cairo_fc_private)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_140 = $(cairo_fc_cxx_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_141 = $(cairo_fc_sources)
--@CAIRO_HAS_FC_FONT_TRUE@am__append_142 = cairo-fc.pc
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_143 = $(cairo_ps_headers)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_144 = $(cairo_ps_private)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_145 = $(cairo_ps_cxx_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_146 = $(cairo_ps_sources)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__append_147 = cairo-ps.pc
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_148 = $(cairo_pdf_headers)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_149 = $(cairo_pdf_private)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_150 = $(cairo_pdf_cxx_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_151 = $(cairo_pdf_sources)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_152 = cairo-pdf.pc
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_153 = $(cairo_svg_headers)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_154 = $(cairo_svg_private)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_155 = $(cairo_svg_cxx_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_156 = $(cairo_svg_sources)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_157 = cairo-svg.pc
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_158 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_159 = $(cairo_test_surfaces_cxx_sources)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_160 = $(cairo_test_surfaces_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_161 = $(cairo_tee_headers)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_162 = $(cairo_tee_private)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_163 = $(cairo_tee_cxx_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_164 = $(cairo_tee_sources)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_165 = cairo-tee.pc
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_166 = $(cairo_xml_headers)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_167 = $(cairo_xml_private)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_168 = $(cairo_xml_cxx_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_169 = $(cairo_xml_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__append_170 = cairo-xml.pc
--@CAIRO_HAS_PTHREAD_TRUE@am__append_171 = $(cairo_pthread_private) $(cairo_pthread_headers)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_172 = $(cairo_pthread_cxx_sources)
--@CAIRO_HAS_PTHREAD_TRUE@am__append_173 = $(cairo_pthread_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_174 = $(cairo_gobject_headers)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_175 = $(cairo_gobject_private)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_176 = $(cairo_gobject_cxx_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_177 = $(cairo_gobject_sources)
--@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_178 = cairo-gobject.pc
--@CAIRO_HAS_TRACE_TRUE@am__append_179 = $(cairo_trace_private) $(cairo_trace_headers)
--@CAIRO_HAS_TRACE_TRUE@am__append_180 = $(cairo_trace_cxx_sources)
--@CAIRO_HAS_TRACE_TRUE@am__append_181 = $(cairo_trace_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_182 = $(cairo_interpreter_private) $(cairo_interpreter_headers)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_183 = $(cairo_interpreter_cxx_sources)
--@CAIRO_HAS_INTERPRETER_TRUE@am__append_184 = $(cairo_interpreter_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_185 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_186 = $(cairo_symbol_lookup_cxx_sources)
--@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_187 = $(cairo_symbol_lookup_sources)
--@CROSS_COMPILING_FALSE@am__append_188 = check-link$(EXEEXT)
-+@CROSS_COMPILING_FALSE@am__append_1 = check-link$(EXEEXT)
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -357,302 +111,7 @@
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- @BUILD_CXX_TRUE@am__DEPENDENCIES_2 = libcairo_cxx.la
--am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \
--	cairo-xlib-xrender.h cairo-xcb.h cairo-qt.h cairo-quartz.h \
--	cairo-quartz-image.h cairo-win32.h cairo-skia.h cairo-os2.h \
--	cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \
--	cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \
--	cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \
--	cairoint.h cairo-analysis-surface-private.h \
--	cairo-arc-private.h cairo-atomic-private.h \
--	cairo-boxes-private.h cairo-cache-private.h \
--	cairo-clip-private.h cairo-combsort-private.h \
--	cairo-compiler-private.h cairo-composite-rectangles-private.h \
--	cairo-device-private.h cairo-error-private.h \
--	cairo-fixed-private.h cairo-fixed-type-private.h \
--	cairo-freelist-private.h cairo-freelist-type-private.h \
--	cairo-freed-pool-private.h cairo-fontconfig-private.h \
--	cairo-gstate-private.h cairo-hash-private.h \
--	cairo-image-info-private.h cairo-list-private.h \
--	cairo-malloc-private.h cairo-recording-surface-private.h \
--	cairo-mutex-impl-private.h cairo-mutex-list-private.h \
--	cairo-mutex-private.h cairo-mutex-type-private.h \
--	cairo-output-stream-private.h cairo-paginated-private.h \
--	cairo-paginated-surface-private.h cairo-path-fixed-private.h \
--	cairo-path-private.h cairo-private.h \
--	cairo-reference-count-private.h cairo-region-private.h \
--	cairo-rtree-private.h cairo-scaled-font-private.h \
--	cairo-slope-private.h cairo-spans-private.h \
--	cairo-surface-fallback-private.h cairo-surface-private.h \
--	cairo-surface-clipper-private.h cairo-surface-offset-private.h \
--	cairo-surface-subsurface-private.h \
--	cairo-surface-snapshot-private.h \
--	cairo-surface-wrapper-private.h cairo-types-private.h \
--	cairo-user-font-private.h cairo-wideint-private.h \
--	cairo-wideint-type-private.h \
--	cairo-scaled-font-subsets-private.h \
--	cairo-truetype-subset-private.h cairo-type1-private.h \
--	cairo-type3-glyph-surface-private.h \
--	cairo-pdf-operators-private.h cairo-xlib-private.h \
--	cairo-xlib-surface-private.h cairo-xlib-xrender-private.h \
--	cairo-xcb-private.h cairo-quartz-private.h \
--	cairo-win32-private.h cairo-os2-private.h \
--	drm/cairo-drm-private.h drm/cairo-drm-ioctl-private.h \
--	drm/cairo-drm-intel-private.h \
--	drm/cairo-drm-intel-ioctl-private.h \
--	drm/cairo-drm-i915-private.h drm/cairo-drm-i965-private.h \
--	drm/cairo-drm-intel-brw-defines.h \
--	drm/cairo-drm-intel-brw-structs.h drm/cairo-drm-intel-brw-eu.h \
--	drm/cairo-drm-radeon-private.h cairo-gl-private.h \
--	cairo-gl-gradient-private.h glew/GL/glew.h glew/GL/glxew.h \
--	cairo-ft-private.h cairo-ps-surface-private.h \
--	cairo-pdf-surface-private.h cairo-svg-surface-private.h \
--	test-fallback-surface.h test-fallback16-surface.h \
--	test-null-surface.h test-paginated-surface.h \
--	test-wrapping-surface.h cairo-tee-surface-private.h \
--	cairo-analysis-surface.c cairo-arc.c cairo-array.c \
--	cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \
--	cairo-bentley-ottmann.c cairo-bentley-ottmann-rectangular.c \
--	cairo-bentley-ottmann-rectilinear.c \
--	cairo-botor-scan-converter.c cairo-boxes.c cairo.c \
--	cairo-cache.c cairo-clip.c cairo-color.c \
--	cairo-composite-rectangles.c cairo-debug.c cairo-device.c \
--	cairo-fixed.c cairo-font-face.c cairo-font-face-twin.c \
--	cairo-font-face-twin-data.c cairo-font-options.c \
--	cairo-freelist.c cairo-freed-pool.c cairo-gstate.c \
--	cairo-hash.c cairo-hull.c cairo-image-info.c \
--	cairo-image-surface.c cairo-lzw.c cairo-matrix.c \
--	cairo-recording-surface.c cairo-misc.c cairo-mutex.c \
--	cairo-observer.c cairo-output-stream.c \
--	cairo-paginated-surface.c cairo-path-bounds.c cairo-path.c \
--	cairo-path-fill.c cairo-path-fixed.c cairo-path-in-fill.c \
--	cairo-path-stroke.c cairo-pattern.c cairo-pen.c \
--	cairo-polygon.c cairo-rectangle.c \
--	cairo-rectangular-scan-converter.c cairo-region.c \
--	cairo-rtree.c cairo-scaled-font.c cairo-slope.c cairo-spans.c \
--	cairo-spline.c cairo-stroke-style.c cairo-surface.c \
--	cairo-surface-fallback.c cairo-surface-clipper.c \
--	cairo-surface-offset.c cairo-surface-snapshot.c \
--	cairo-surface-subsurface.c cairo-surface-wrapper.c \
--	cairo-system.c cairo-tor-scan-converter.c \
--	cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \
--	cairo-user-font.c cairo-version.c cairo-wideint.c \
--	cairo-cff-subset.c cairo-scaled-font-subsets.c \
--	cairo-truetype-subset.c cairo-type1-fallback.c \
--	cairo-type1-subset.c cairo-type3-glyph-surface.c \
--	cairo-pdf-operators.c cairo-deflate-stream.c \
--	cairo-xlib-display.c cairo-xlib-screen.c cairo-xlib-surface.c \
--	cairo-xlib-visual.c cairo-xlib-xcb-surface.c \
--	cairo-xcb-connection.c cairo-xcb-connection-core.c \
--	cairo-xcb-connection-render.c cairo-xcb-screen.c \
--	cairo-xcb-surface.c cairo-xcb-surface-cairo.c \
--	cairo-xcb-surface-core.c cairo-xcb-surface-render.c \
--	cairo-xcb-shm.c cairo-xcb-connection-shm.c \
--	cairo-quartz-surface.c cairo-quartz-font.c \
--	cairo-quartz-image-surface.c cairo-win32-surface.c \
--	cairo-win32-printing-surface.c cairo-win32-font.c \
--	cairo-os2-surface.c drm/cairo-drm.c drm/cairo-drm-bo.c \
--	drm/cairo-drm-surface.c drm/cairo-drm-intel.c \
--	drm/cairo-drm-intel-debug.c drm/cairo-drm-intel-surface.c \
--	drm/cairo-drm-i915-surface.c drm/cairo-drm-i915-glyphs.c \
--	drm/cairo-drm-i915-shader.c drm/cairo-drm-i915-spans.c \
--	drm/cairo-drm-i965-surface.c drm/cairo-drm-i965-glyphs.c \
--	drm/cairo-drm-i965-shader.c drm/cairo-drm-i965-spans.c \
--	drm/cairo-drm-intel-brw-eu.c drm/cairo-drm-intel-brw-eu-emit.c \
--	drm/cairo-drm-intel-brw-eu-util.c drm/cairo-drm-radeon.c \
--	drm/cairo-drm-radeon-surface.c drm/cairo-drm-xr.c \
--	drm/cairo-drm-gallium-surface.c cairo-png.c \
--	cairo-gl-composite.c cairo-gl-device.c cairo-gl-glyphs.c \
--	cairo-gl-gradient.c cairo-gl-shaders.c cairo-gl-surface.c \
--	glew/glew.c cairo-directfb-surface.c cairo-vg-surface.c \
--	cairo-egl-context.c cairo-glx-context.c cairo-wgl-context.c \
--	cairo-script-surface.c cairo-ft-font.c cairo-ps-surface.c \
--	cairo-pdf-surface.c cairo-svg-surface.c \
--	test-fallback-surface.c test-fallback16-surface.c \
--	test-null-surface.c test-paginated-surface.c \
--	test-wrapping-surface.c cairo-tee-surface.c \
--	cairo-xml-surface.c cairo-version.h
--am__objects_1 =
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_2 = $(am__objects_1)
--@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__objects_3 = $(am__objects_1)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_4 = $(am__objects_1)
--@CAIRO_HAS_QT_SURFACE_TRUE@am__objects_5 = $(am__objects_1)
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_6 = $(am__objects_1)
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__objects_7 = $(am__objects_1)
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_8 = $(am__objects_1)
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__objects_9 = $(am__objects_1)
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__objects_10 = $(am__objects_1)
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__objects_11 = $(am__objects_1)
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__objects_12 = $(am__objects_1)
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__objects_13 = $(am__objects_1)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__objects_14 = $(am__objects_1)
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__objects_15 = $(am__objects_1)
--@CAIRO_HAS_VG_SURFACE_TRUE@am__objects_16 = $(am__objects_1)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_17 = $(am__objects_1)
--@CAIRO_HAS_FT_FONT_TRUE@am__objects_18 = $(am__objects_1)
--@CAIRO_HAS_PS_SURFACE_TRUE@am__objects_19 = $(am__objects_1)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_20 = $(am__objects_1)
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_21 = $(am__objects_1)
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__objects_22 = $(am__objects_1)
--@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_23 = $(am__objects_1)
--am__objects_24 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
--	$(am__objects_4) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_5) $(am__objects_6) $(am__objects_1) \
--	$(am__objects_7) $(am__objects_8) $(am__objects_1) \
--	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
--	$(am__objects_12) $(am__objects_13) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_14) \
--	$(am__objects_15) $(am__objects_16) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_17) \
--	$(am__objects_18) $(am__objects_1) $(am__objects_19) \
--	$(am__objects_20) $(am__objects_21) $(am__objects_22) \
--	$(am__objects_23) $(am__objects_1)
--am__objects_25 = $(am__objects_1) $(am__objects_1)
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_26 = $(am__objects_1)
--am__objects_27 = $(am__objects_25) $(am__objects_2) $(am__objects_1) \
--	$(am__objects_4) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_6) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_8) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_10) $(am__objects_1) \
--	$(am__objects_12) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_14) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_18) $(am__objects_1) $(am__objects_19) \
--	$(am__objects_20) $(am__objects_21) $(am__objects_26) \
--	$(am__objects_22) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1)
--am__objects_28 = cairo-cff-subset.lo cairo-scaled-font-subsets.lo \
--	cairo-truetype-subset.lo cairo-type1-fallback.lo \
--	cairo-type1-subset.lo cairo-type3-glyph-surface.lo
--am__objects_29 = cairo-pdf-operators.lo
--am__objects_30 = cairo-deflate-stream.lo
--@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_FALSE@@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_31 = $(am__objects_30)
--@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_31 = $(am__objects_30)
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_31 = $(am__objects_30)
--am__objects_32 = cairo-analysis-surface.lo cairo-arc.lo cairo-array.lo \
--	cairo-atomic.lo cairo-base64-stream.lo cairo-base85-stream.lo \
--	cairo-bentley-ottmann.lo cairo-bentley-ottmann-rectangular.lo \
--	cairo-bentley-ottmann-rectilinear.lo \
--	cairo-botor-scan-converter.lo cairo-boxes.lo cairo.lo \
--	cairo-cache.lo cairo-clip.lo cairo-color.lo \
--	cairo-composite-rectangles.lo cairo-debug.lo cairo-device.lo \
--	cairo-fixed.lo cairo-font-face.lo cairo-font-face-twin.lo \
--	cairo-font-face-twin-data.lo cairo-font-options.lo \
--	cairo-freelist.lo cairo-freed-pool.lo cairo-gstate.lo \
--	cairo-hash.lo cairo-hull.lo cairo-image-info.lo \
--	cairo-image-surface.lo cairo-lzw.lo cairo-matrix.lo \
--	cairo-recording-surface.lo cairo-misc.lo cairo-mutex.lo \
--	cairo-observer.lo cairo-output-stream.lo \
--	cairo-paginated-surface.lo cairo-path-bounds.lo cairo-path.lo \
--	cairo-path-fill.lo cairo-path-fixed.lo cairo-path-in-fill.lo \
--	cairo-path-stroke.lo cairo-pattern.lo cairo-pen.lo \
--	cairo-polygon.lo cairo-rectangle.lo \
--	cairo-rectangular-scan-converter.lo cairo-region.lo \
--	cairo-rtree.lo cairo-scaled-font.lo cairo-slope.lo \
--	cairo-spans.lo cairo-spline.lo cairo-stroke-style.lo \
--	cairo-surface.lo cairo-surface-fallback.lo \
--	cairo-surface-clipper.lo cairo-surface-offset.lo \
--	cairo-surface-snapshot.lo cairo-surface-subsurface.lo \
--	cairo-surface-wrapper.lo cairo-system.lo \
--	cairo-tor-scan-converter.lo cairo-toy-font-face.lo \
--	cairo-traps.lo cairo-unicode.lo cairo-user-font.lo \
--	cairo-version.lo cairo-wideint.lo $(am__objects_28) \
--	$(am__objects_29) $(am__objects_31)
--@BUILD_XLIB_XCB_FALSE@am__objects_33 = cairo-xlib-display.lo \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-screen.lo \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-surface.lo \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-visual.lo
--@BUILD_XLIB_XCB_TRUE@am__objects_33 = cairo-xlib-xcb-surface.lo
--@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_34 = $(am__objects_33)
--@BUILD_XCB_SHM_TRUE@am__objects_35 = cairo-xcb-shm.lo \
--@BUILD_XCB_SHM_TRUE@	cairo-xcb-connection-shm.lo
--am__objects_36 = cairo-xcb-connection.lo cairo-xcb-connection-core.lo \
--	cairo-xcb-connection-render.lo cairo-xcb-screen.lo \
--	cairo-xcb-surface.lo cairo-xcb-surface-cairo.lo \
--	cairo-xcb-surface-core.lo cairo-xcb-surface-render.lo \
--	$(am__objects_35)
--@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_37 = $(am__objects_36)
--am__objects_38 = cairo-quartz-surface.lo
--@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_39 = $(am__objects_38)
--am__objects_40 = cairo-quartz-font.lo
--@CAIRO_HAS_QUARTZ_FONT_TRUE@am__objects_41 = $(am__objects_40)
--am__objects_42 = cairo-quartz-image-surface.lo
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__objects_43 =  \
--@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@	$(am__objects_42)
--am__objects_44 = cairo-win32-surface.lo \
--	cairo-win32-printing-surface.lo
--@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_45 = $(am__objects_44)
--am__objects_46 = cairo-win32-font.lo
--@CAIRO_HAS_WIN32_FONT_TRUE@am__objects_47 = $(am__objects_46)
--am__objects_48 = cairo-os2-surface.lo
--@CAIRO_HAS_OS2_SURFACE_TRUE@am__objects_49 = $(am__objects_48)
--am__objects_50 = cairo-drm.lo cairo-drm-bo.lo cairo-drm-surface.lo \
--	cairo-drm-intel.lo cairo-drm-intel-debug.lo \
--	cairo-drm-intel-surface.lo cairo-drm-i915-surface.lo \
--	cairo-drm-i915-glyphs.lo cairo-drm-i915-shader.lo \
--	cairo-drm-i915-spans.lo cairo-drm-i965-surface.lo \
--	cairo-drm-i965-glyphs.lo cairo-drm-i965-shader.lo \
--	cairo-drm-i965-spans.lo cairo-drm-intel-brw-eu.lo \
--	cairo-drm-intel-brw-eu-emit.lo cairo-drm-intel-brw-eu-util.lo \
--	cairo-drm-radeon.lo cairo-drm-radeon-surface.lo
--@CAIRO_HAS_DRM_SURFACE_TRUE@am__objects_51 = $(am__objects_50)
--am__objects_52 = cairo-drm-xr.lo
--@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__objects_53 = $(am__objects_52)
--am__objects_54 = cairo-drm-gallium-surface.lo
--@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__objects_55 = $(am__objects_54)
--am__objects_56 = cairo-png.lo
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__objects_57 = $(am__objects_56)
--@BUILD_PRIVATE_GLEW_TRUE@am__objects_58 = glew.lo
--am__objects_59 = cairo-gl-composite.lo cairo-gl-device.lo \
--	cairo-gl-glyphs.lo cairo-gl-gradient.lo cairo-gl-shaders.lo \
--	cairo-gl-surface.lo $(am__objects_58)
--@CAIRO_HAS_GL_SURFACE_TRUE@am__objects_60 = $(am__objects_59)
--am__objects_61 = cairo-directfb-surface.lo
--@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__objects_62 = $(am__objects_61)
--am__objects_63 = cairo-vg-surface.lo
--@CAIRO_HAS_VG_SURFACE_TRUE@am__objects_64 = $(am__objects_63)
--am__objects_65 = cairo-egl-context.lo
--@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__objects_66 = $(am__objects_65)
--am__objects_67 = cairo-glx-context.lo
--@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__objects_68 = $(am__objects_67)
--am__objects_69 = cairo-wgl-context.lo
--@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__objects_70 = $(am__objects_69)
--am__objects_71 = cairo-script-surface.lo
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_72 = $(am__objects_71)
--am__objects_73 = cairo-ft-font.lo
--@CAIRO_HAS_FT_FONT_TRUE@am__objects_74 = $(am__objects_73)
--am__objects_75 = cairo-ps-surface.lo
--@CAIRO_HAS_PS_SURFACE_TRUE@am__objects_76 = $(am__objects_75)
--am__objects_77 = cairo-pdf-surface.lo
--@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_78 = $(am__objects_77)
--am__objects_79 = cairo-svg-surface.lo
--@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_80 = $(am__objects_79)
--am__objects_81 = test-fallback-surface.lo test-fallback16-surface.lo \
--	test-null-surface.lo test-paginated-surface.lo \
--	test-wrapping-surface.lo
--@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_82 = $(am__objects_81)
--am__objects_83 = cairo-tee-surface.lo
--@CAIRO_HAS_TEE_SURFACE_TRUE@am__objects_84 = $(am__objects_83)
--am__objects_85 = cairo-xml-surface.lo
--@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_86 = $(am__objects_85)
--am__objects_87 = $(am__objects_32) $(am__objects_34) $(am__objects_1) \
--	$(am__objects_37) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_39) $(am__objects_41) \
--	$(am__objects_43) $(am__objects_45) $(am__objects_47) \
--	$(am__objects_1) $(am__objects_49) $(am__objects_1) \
--	$(am__objects_51) $(am__objects_53) $(am__objects_55) \
--	$(am__objects_1) $(am__objects_57) $(am__objects_60) \
--	$(am__objects_62) $(am__objects_64) $(am__objects_66) \
--	$(am__objects_68) $(am__objects_70) $(am__objects_72) \
--	$(am__objects_74) $(am__objects_1) $(am__objects_76) \
--	$(am__objects_78) $(am__objects_80) $(am__objects_82) \
--	$(am__objects_84) $(am__objects_86) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1)
--am_libcairo_la_OBJECTS = $(am__objects_24) $(am__objects_27) \
--	$(am__objects_87)
-+am_libcairo_la_OBJECTS =
- nodist_libcairo_la_OBJECTS =
- libcairo_la_OBJECTS = $(am_libcairo_la_OBJECTS) \
- 	$(nodist_libcairo_la_OBJECTS)
-@@ -662,87 +121,12 @@
- libcairo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libcairo_la_LDFLAGS) $(LDFLAGS) -o $@
--am__libcairo_cxx_la_SOURCES_DIST = cairo.h cairo-deprecated.h \
--	cairo-xlib.h cairo-xlib-xrender.h cairo-xcb.h cairo-qt.h \
--	cairo-quartz.h cairo-quartz-image.h cairo-win32.h cairo-skia.h \
--	cairo-os2.h cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \
--	cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \
--	cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \
--	cairoint.h cairo-analysis-surface-private.h \
--	cairo-arc-private.h cairo-atomic-private.h \
--	cairo-boxes-private.h cairo-cache-private.h \
--	cairo-clip-private.h cairo-combsort-private.h \
--	cairo-compiler-private.h cairo-composite-rectangles-private.h \
--	cairo-device-private.h cairo-error-private.h \
--	cairo-fixed-private.h cairo-fixed-type-private.h \
--	cairo-freelist-private.h cairo-freelist-type-private.h \
--	cairo-freed-pool-private.h cairo-fontconfig-private.h \
--	cairo-gstate-private.h cairo-hash-private.h \
--	cairo-image-info-private.h cairo-list-private.h \
--	cairo-malloc-private.h cairo-recording-surface-private.h \
--	cairo-mutex-impl-private.h cairo-mutex-list-private.h \
--	cairo-mutex-private.h cairo-mutex-type-private.h \
--	cairo-output-stream-private.h cairo-paginated-private.h \
--	cairo-paginated-surface-private.h cairo-path-fixed-private.h \
--	cairo-path-private.h cairo-private.h \
--	cairo-reference-count-private.h cairo-region-private.h \
--	cairo-rtree-private.h cairo-scaled-font-private.h \
--	cairo-slope-private.h cairo-spans-private.h \
--	cairo-surface-fallback-private.h cairo-surface-private.h \
--	cairo-surface-clipper-private.h cairo-surface-offset-private.h \
--	cairo-surface-subsurface-private.h \
--	cairo-surface-snapshot-private.h \
--	cairo-surface-wrapper-private.h cairo-types-private.h \
--	cairo-user-font-private.h cairo-wideint-private.h \
--	cairo-wideint-type-private.h \
--	cairo-scaled-font-subsets-private.h \
--	cairo-truetype-subset-private.h cairo-type1-private.h \
--	cairo-type3-glyph-surface-private.h \
--	cairo-pdf-operators-private.h cairo-xlib-private.h \
--	cairo-xlib-surface-private.h cairo-xlib-xrender-private.h \
--	cairo-xcb-private.h cairo-quartz-private.h \
--	cairo-win32-private.h cairo-os2-private.h \
--	drm/cairo-drm-private.h drm/cairo-drm-ioctl-private.h \
--	drm/cairo-drm-intel-private.h \
--	drm/cairo-drm-intel-ioctl-private.h \
--	drm/cairo-drm-i915-private.h drm/cairo-drm-i965-private.h \
--	drm/cairo-drm-intel-brw-defines.h \
--	drm/cairo-drm-intel-brw-structs.h drm/cairo-drm-intel-brw-eu.h \
--	drm/cairo-drm-radeon-private.h cairo-gl-private.h \
--	cairo-gl-gradient-private.h glew/GL/glew.h glew/GL/glxew.h \
--	cairo-ft-private.h cairo-ps-surface-private.h \
--	cairo-pdf-surface-private.h cairo-svg-surface-private.h \
--	test-fallback-surface.h test-fallback16-surface.h \
--	test-null-surface.h test-paginated-surface.h \
--	test-wrapping-surface.h cairo-tee-surface-private.h \
--	cairo-qt-surface.cpp cairo-skia-surface.cpp \
--	cairo-beos-surface.cpp
--am__objects_88 = cairo-qt-surface.lo
--@CAIRO_HAS_QT_SURFACE_TRUE@am__objects_89 = $(am__objects_88)
--am__objects_90 = cairo-skia-surface.lo
--@CAIRO_HAS_SKIA_SURFACE_TRUE@am__objects_91 = $(am__objects_90)
--am__objects_92 = cairo-beos-surface.lo
--@CAIRO_HAS_BEOS_SURFACE_TRUE@am__objects_93 = $(am__objects_92)
--am__objects_94 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_89) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_91) \
--	$(am__objects_1) $(am__objects_93) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1) \
--	$(am__objects_1) $(am__objects_1) $(am__objects_1)
--am_libcairo_cxx_la_OBJECTS = $(am__objects_24) $(am__objects_27) \
--	$(am__objects_94)
-+am_libcairo_cxx_la_OBJECTS =
- libcairo_cxx_la_OBJECTS = $(am_libcairo_cxx_la_OBJECTS)
--libcairo_cxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
--	$(AM_CXXFLAGS) $(CXXFLAGS) $(libcairo_cxx_la_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+libcairo_cxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+	$(AM_CFLAGS) $(CFLAGS) $(libcairo_cxx_la_LDFLAGS) $(LDFLAGS) \
-+	-o $@
- @BUILD_CXX_TRUE@am_libcairo_cxx_la_rpath =
- check_link_SOURCES = check-link.c
- check_link_OBJECTS = check-link.$(OBJEXT)
-@@ -770,37 +154,14 @@
- AM_V_CCLD = $(am__v_CCLD_$(V))
- am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
- am__v_CCLD_0 = @echo "  CCLD  " $@;
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
--AM_V_CXX = $(am__v_CXX_$(V))
--am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
--am__v_CXX_0 = @echo "  CXX   " $@;
--CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--AM_V_CXXLD = $(am__v_CXXLD_$(V))
--am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
--am__v_CXXLD_0 = @echo "  CXXLD " $@;
- AM_V_GEN = $(am__v_GEN_$(V))
- am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
- am__v_GEN_0 = @echo "  GEN   " $@;
- SOURCES = $(libcairo_la_SOURCES) $(nodist_libcairo_la_SOURCES) \
- 	$(libcairo_cxx_la_SOURCES) check-link.c
--DIST_SOURCES = $(am__libcairo_la_SOURCES_DIST) \
--	$(am__libcairo_cxx_la_SOURCES_DIST) check-link.c
-+DIST_SOURCES = $(libcairo_la_SOURCES) $(libcairo_cxx_la_SOURCES) \
-+	check-link.c
- DATA = $(pkgconfig_DATA)
--am__cairoinclude_HEADERS_DIST = cairo.h cairo-deprecated.h \
--	cairo-xlib.h cairo-xlib-xrender.h cairo-xcb.h cairo-qt.h \
--	cairo-quartz.h cairo-quartz-image.h cairo-win32.h cairo-skia.h \
--	cairo-os2.h cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \
--	cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \
--	cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \
--	$(top_srcdir)/cairo-version.h
- HEADERS = $(cairoinclude_HEADERS) $(nodist_cairoinclude_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-@@ -888,6 +249,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -977,6 +339,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -1028,408 +391,6 @@
- 	$(TESTS_SH) check-has-hidden-symbols.c
- EXTRA_LTLIBRARIES = 
- MAINTAINERCLEANFILES = Makefile.in
--cairo_headers = cairo.h cairo-deprecated.h
--cairo_private = cairoint.h cairo-analysis-surface-private.h \
--	cairo-arc-private.h cairo-atomic-private.h \
--	cairo-boxes-private.h cairo-cache-private.h \
--	cairo-clip-private.h cairo-combsort-private.h \
--	cairo-compiler-private.h cairo-composite-rectangles-private.h \
--	cairo-device-private.h cairo-error-private.h \
--	cairo-fixed-private.h cairo-fixed-type-private.h \
--	cairo-freelist-private.h cairo-freelist-type-private.h \
--	cairo-freed-pool-private.h cairo-fontconfig-private.h \
--	cairo-gstate-private.h cairo-hash-private.h \
--	cairo-image-info-private.h cairo-list-private.h \
--	cairo-malloc-private.h cairo-recording-surface-private.h \
--	cairo-mutex-impl-private.h cairo-mutex-list-private.h \
--	cairo-mutex-private.h cairo-mutex-type-private.h \
--	cairo-output-stream-private.h cairo-paginated-private.h \
--	cairo-paginated-surface-private.h cairo-path-fixed-private.h \
--	cairo-path-private.h cairo-private.h \
--	cairo-reference-count-private.h cairo-region-private.h \
--	cairo-rtree-private.h cairo-scaled-font-private.h \
--	cairo-slope-private.h cairo-spans-private.h \
--	cairo-surface-fallback-private.h cairo-surface-private.h \
--	cairo-surface-clipper-private.h cairo-surface-offset-private.h \
--	cairo-surface-subsurface-private.h \
--	cairo-surface-snapshot-private.h \
--	cairo-surface-wrapper-private.h cairo-types-private.h \
--	cairo-user-font-private.h cairo-wideint-private.h \
--	cairo-wideint-type-private.h $(NULL) \
--	$(_cairo_font_subset_private) $(_cairo_pdf_operators_private)
--cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \
--	cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \
--	cairo-bentley-ottmann.c cairo-bentley-ottmann-rectangular.c \
--	cairo-bentley-ottmann-rectilinear.c \
--	cairo-botor-scan-converter.c cairo-boxes.c cairo.c \
--	cairo-cache.c cairo-clip.c cairo-color.c \
--	cairo-composite-rectangles.c cairo-debug.c cairo-device.c \
--	cairo-fixed.c cairo-font-face.c cairo-font-face-twin.c \
--	cairo-font-face-twin-data.c cairo-font-options.c \
--	cairo-freelist.c cairo-freed-pool.c cairo-gstate.c \
--	cairo-hash.c cairo-hull.c cairo-image-info.c \
--	cairo-image-surface.c cairo-lzw.c cairo-matrix.c \
--	cairo-recording-surface.c cairo-misc.c cairo-mutex.c \
--	cairo-observer.c cairo-output-stream.c \
--	cairo-paginated-surface.c cairo-path-bounds.c cairo-path.c \
--	cairo-path-fill.c cairo-path-fixed.c cairo-path-in-fill.c \
--	cairo-path-stroke.c cairo-pattern.c cairo-pen.c \
--	cairo-polygon.c cairo-rectangle.c \
--	cairo-rectangular-scan-converter.c cairo-region.c \
--	cairo-rtree.c cairo-scaled-font.c cairo-slope.c cairo-spans.c \
--	cairo-spline.c cairo-stroke-style.c cairo-surface.c \
--	cairo-surface-fallback.c cairo-surface-clipper.c \
--	cairo-surface-offset.c cairo-surface-snapshot.c \
--	cairo-surface-subsurface.c cairo-surface-wrapper.c \
--	cairo-system.c cairo-tor-scan-converter.c \
--	cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \
--	cairo-user-font.c cairo-version.c cairo-wideint.c $(NULL) \
--	$(_cairo_font_subset_sources) $(_cairo_pdf_operators_sources) \
--	$(req_cairo_deflate_stream_sources) $(NULL)
--_cairo_font_subset_private = \
--	cairo-scaled-font-subsets-private.h \
--	cairo-truetype-subset-private.h \
--	cairo-type1-private.h \
--        cairo-type3-glyph-surface-private.h \
--	$(NULL)
--
--_cairo_font_subset_sources = \
--	cairo-cff-subset.c \
--	cairo-scaled-font-subsets.c \
--	cairo-truetype-subset.c \
--	cairo-type1-fallback.c \
--	cairo-type1-subset.c \
--        cairo-type3-glyph-surface.c \
--	$(NULL)
--
--cairo_egl_sources = cairo-egl-context.c
--cairo_glx_sources = cairo-glx-context.c
--cairo_wgl_sources = cairo-wgl-context.c
--_cairo_pdf_operators_private = cairo-pdf-operators-private.h
--_cairo_pdf_operators_sources = cairo-pdf-operators.c
--cairo_png_sources = cairo-png.c
--cairo_ps_headers = cairo-ps.h
--cairo_ps_private = cairo-ps-surface-private.h
--cairo_ps_sources = cairo-ps-surface.c
--cairo_deflate_stream_sources = cairo-deflate-stream.c
--cairo_pdf_headers = cairo-pdf.h
--cairo_pdf_private = cairo-pdf-surface-private.h
--cairo_pdf_sources = cairo-pdf-surface.c
--@CAIRO_HAS_PDF_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--@CAIRO_HAS_SCRIPT_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--@CAIRO_HAS_XML_SURFACE_TRUE@req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
--cairo_svg_headers = cairo-svg.h
--cairo_svg_private = cairo-svg-surface-private.h
--cairo_svg_sources = cairo-svg-surface.c
--cairo_ft_headers = cairo-ft.h
--cairo_ft_private = cairo-ft-private.h
--cairo_ft_sources = cairo-ft-font.c
--
--# These are private, even though they look like public headers
--cairo_test_surfaces_private = \
--	test-fallback-surface.h \
--	test-fallback16-surface.h \
--	test-null-surface.h \
--	test-paginated-surface.h \
--	test-wrapping-surface.h \
--	$(NULL)
--
--cairo_test_surfaces_sources = \
--	test-fallback-surface.c \
--	test-fallback16-surface.c \
--	test-null-surface.c \
--	test-paginated-surface.c \
--	test-wrapping-surface.c \
--	$(NULL)
--
--cairo_xlib_headers = cairo-xlib.h
--cairo_xlib_private = \
--	cairo-xlib-private.h \
--	cairo-xlib-surface-private.h \
--	cairo-xlib-xrender-private.h \
--	$(NULL)
--
--@BUILD_XLIB_XCB_FALSE@cairo_xlib_sources = \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-display.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-screen.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-surface.c \
--@BUILD_XLIB_XCB_FALSE@	cairo-xlib-visual.c \
--@BUILD_XLIB_XCB_FALSE@	$(NULL)
--
--@BUILD_XLIB_XCB_TRUE@cairo_xlib_sources = cairo-xlib-xcb-surface.c
--cairo_xlib_xrender_headers = cairo-xlib-xrender.h
--cairo_xcb_headers = cairo-xcb.h
--cairo_xcb_private = cairo-xcb-private.h
--cairo_xcb_sources = cairo-xcb-connection.c cairo-xcb-connection-core.c \
--	cairo-xcb-connection-render.c cairo-xcb-screen.c \
--	cairo-xcb-surface.c cairo-xcb-surface-cairo.c \
--	cairo-xcb-surface-core.c cairo-xcb-surface-render.c $(NULL) \
--	$(am__append_1)
--cairo_qt_headers = cairo-qt.h
--cairo_qt_cxx_sources = cairo-qt-surface.cpp
--cairo_quartz_headers = cairo-quartz.h
--cairo_quartz_private = cairo-quartz-private.h
--cairo_quartz_sources = cairo-quartz-surface.c
--cairo_quartz_image_headers = cairo-quartz-image.h
--cairo_quartz_image_sources = cairo-quartz-image-surface.c
--cairo_quartz_font_sources = cairo-quartz-font.c
--cairo_win32_headers = cairo-win32.h
--cairo_win32_private = cairo-win32-private.h
--cairo_win32_sources = cairo-win32-surface.c cairo-win32-printing-surface.c
--cairo_win32_font_sources = cairo-win32-font.c
--cairo_skia_headers = cairo-skia.h
--cairo_skia_cxx_sources = cairo-skia-surface.cpp
--cairo_os2_headers = cairo-os2.h
--cairo_os2_private = cairo-os2-private.h
--cairo_os2_sources = cairo-os2-surface.c
--
--# automake is stupid enough to always use c++ linker if we enable the
--# following lines, even if beos surface is not enabled.  Disable it for now.
--cairo_beos_headers = cairo-beos.h
--cairo_beos_cxx_sources = cairo-beos-surface.cpp
--cairo_gl_headers = cairo-gl.h
--cairo_gl_private = cairo-gl-private.h \
--		   cairo-gl-gradient-private.h \
--		   glew/GL/glew.h \
--		   glew/GL/glxew.h
--
--cairo_gl_sources = cairo-gl-composite.c cairo-gl-device.c \
--	cairo-gl-glyphs.c cairo-gl-gradient.c cairo-gl-shaders.c \
--	cairo-gl-surface.c $(am__append_2)
--cairo_directfb_headers = cairo-directfb.h
--cairo_directfb_sources = cairo-directfb-surface.c
--cairo_drm_headers = cairo-drm.h
--cairo_drm_private = drm/cairo-drm-private.h \
--		    drm/cairo-drm-ioctl-private.h \
--		    drm/cairo-drm-intel-private.h \
--		    drm/cairo-drm-intel-ioctl-private.h \
--		    drm/cairo-drm-i915-private.h \
--		    drm/cairo-drm-i965-private.h \
--		    drm/cairo-drm-intel-brw-defines.h \
--		    drm/cairo-drm-intel-brw-structs.h \
--		    drm/cairo-drm-intel-brw-eu.h \
--		    drm/cairo-drm-radeon-private.h
--
--cairo_drm_sources = drm/cairo-drm.c \
--		    drm/cairo-drm-bo.c \
--		    drm/cairo-drm-surface.c \
--		    drm/cairo-drm-intel.c \
--		    drm/cairo-drm-intel-debug.c \
--		    drm/cairo-drm-intel-surface.c \
--		    drm/cairo-drm-i915-surface.c \
--		    drm/cairo-drm-i915-glyphs.c \
--		    drm/cairo-drm-i915-shader.c \
--		    drm/cairo-drm-i915-spans.c \
--		    drm/cairo-drm-i965-surface.c \
--		    drm/cairo-drm-i965-glyphs.c \
--		    drm/cairo-drm-i965-shader.c \
--		    drm/cairo-drm-i965-spans.c \
--		    drm/cairo-drm-intel-brw-eu.c \
--		    drm/cairo-drm-intel-brw-eu-emit.c \
--		    drm/cairo-drm-intel-brw-eu-util.c \
--		    drm/cairo-drm-radeon.c \
--		    drm/cairo-drm-radeon-surface.c
--
--cairo_gallium_sources = drm/cairo-drm-gallium-surface.c
--cairo_drm_xr_headers = cairo-drm-xr.h
--cairo_drm_xr_sources = \
--		    drm/cairo-drm-xr.c \
--		    $(NULL)
--
--cairo_script_headers = cairo-script.h
--cairo_script_sources = cairo-script-surface.c
--cairo_tee_headers = cairo-tee.h
--cairo_tee_private = cairo-tee-surface-private.h
--cairo_tee_sources = cairo-tee-surface.c
--cairo_xml_headers = cairo-xml.h
--cairo_xml_sources = cairo-xml-surface.c
--cairo_vg_headers = cairo-vg.h
--cairo_vg_sources = cairo-vg-surface.c
--supported_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
--	$(cairo_xlib_xrender_headers) $(cairo_xcb_shm_headers) \
--	$(cairo_quartz_headers) $(cairo_quartz_font_headers) \
--	$(cairo_win32_headers) $(cairo_win32_font_headers) \
--	$(cairo_png_headers) $(cairo_egl_headers) $(cairo_glx_headers) \
--	$(cairo_wgl_headers) $(cairo_ft_headers) $(cairo_fc_headers) \
--	$(cairo_ps_headers) $(cairo_pdf_headers) $(cairo_svg_headers) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(cairo_user_headers) $(cairo_gobject_headers)
--unsupported_cairo_headers = $(cairo_xcb_headers) \
--	$(cairo_xlib_xcb_headers) $(cairo_qt_headers) \
--	$(cairo_quartz_image_headers) $(cairo_skia_headers) \
--	$(cairo_os2_headers) $(cairo_beos_headers) \
--	$(cairo_drm_headers) $(cairo_drm_xr_headers) \
--	$(cairo_gallium_headers) $(cairo_xcb_drm_headers) \
--	$(cairo_gl_headers) $(cairo_directfb_headers) \
--	$(cairo_vg_headers) $(cairo_script_headers) \
--	$(cairo_tee_headers) $(cairo_xml_headers)
--all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
--	$(cairo_xlib_xrender_headers) $(cairo_xcb_headers) \
--	$(cairo_xlib_xcb_headers) $(cairo_xcb_shm_headers) \
--	$(cairo_qt_headers) $(cairo_quartz_headers) \
--	$(cairo_quartz_font_headers) $(cairo_quartz_image_headers) \
--	$(cairo_win32_headers) $(cairo_win32_font_headers) \
--	$(cairo_skia_headers) $(cairo_os2_headers) \
--	$(cairo_beos_headers) $(cairo_drm_headers) \
--	$(cairo_drm_xr_headers) $(cairo_gallium_headers) \
--	$(cairo_xcb_drm_headers) $(cairo_png_headers) \
--	$(cairo_gl_headers) $(cairo_directfb_headers) \
--	$(cairo_vg_headers) $(cairo_egl_headers) $(cairo_glx_headers) \
--	$(cairo_wgl_headers) $(cairo_script_headers) \
--	$(cairo_ft_headers) $(cairo_fc_headers) $(cairo_ps_headers) \
--	$(cairo_pdf_headers) $(cairo_svg_headers) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(cairo_tee_headers) $(cairo_xml_headers) \
--	$(cairo_user_headers) $(cairo_gobject_headers)
--all_cairo_private = $(cairo_private) $(cairo_xlib_private) \
--	$(cairo_xlib_xrender_private) $(cairo_xcb_private) \
--	$(cairo_xlib_xcb_private) $(cairo_xcb_shm_private) \
--	$(cairo_qt_private) $(cairo_quartz_private) \
--	$(cairo_quartz_font_private) $(cairo_quartz_image_private) \
--	$(cairo_win32_private) $(cairo_win32_font_private) \
--	$(cairo_skia_private) $(cairo_os2_private) \
--	$(cairo_beos_private) $(cairo_drm_private) \
--	$(cairo_drm_xr_private) $(cairo_gallium_private) \
--	$(cairo_xcb_drm_private) $(cairo_png_private) \
--	$(cairo_gl_private) $(cairo_directfb_private) \
--	$(cairo_vg_private) $(cairo_egl_private) $(cairo_glx_private) \
--	$(cairo_wgl_private) $(cairo_script_private) \
--	$(cairo_ft_private) $(cairo_fc_private) $(cairo_ps_private) \
--	$(cairo_pdf_private) $(cairo_svg_private) \
--	$(cairo_test_surfaces_private) $(cairo_test_surfaces_headers) \
--	$(cairo_image_private) $(cairo_recording_private) \
--	$(cairo_tee_private) $(cairo_xml_private) \
--	$(cairo_user_private) $(cairo_pthread_private) \
--	$(cairo_pthread_headers) $(cairo_gobject_private) \
--	$(cairo_trace_private) $(cairo_trace_headers) \
--	$(cairo_interpreter_private) $(cairo_interpreter_headers) \
--	$(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers)
--all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \
--	$(cairo_xlib_xrender_cxx_sources) $(cairo_xcb_cxx_sources) \
--	$(cairo_xlib_xcb_cxx_sources) $(cairo_xcb_shm_cxx_sources) \
--	$(cairo_qt_cxx_sources) $(cairo_quartz_cxx_sources) \
--	$(cairo_quartz_font_cxx_sources) \
--	$(cairo_quartz_image_cxx_sources) $(cairo_win32_cxx_sources) \
--	$(cairo_win32_font_cxx_sources) $(cairo_skia_cxx_sources) \
--	$(cairo_os2_cxx_sources) $(cairo_beos_cxx_sources) \
--	$(cairo_drm_cxx_sources) $(cairo_drm_xr_cxx_sources) \
--	$(cairo_gallium_cxx_sources) $(cairo_xcb_drm_cxx_sources) \
--	$(cairo_png_cxx_sources) $(cairo_gl_cxx_sources) \
--	$(cairo_directfb_cxx_sources) $(cairo_vg_cxx_sources) \
--	$(cairo_egl_cxx_sources) $(cairo_glx_cxx_sources) \
--	$(cairo_wgl_cxx_sources) $(cairo_script_cxx_sources) \
--	$(cairo_ft_cxx_sources) $(cairo_fc_cxx_sources) \
--	$(cairo_ps_cxx_sources) $(cairo_pdf_cxx_sources) \
--	$(cairo_svg_cxx_sources) $(cairo_test_surfaces_cxx_sources) \
--	$(cairo_image_cxx_sources) $(cairo_recording_cxx_sources) \
--	$(cairo_tee_cxx_sources) $(cairo_xml_cxx_sources) \
--	$(cairo_user_cxx_sources) $(cairo_pthread_cxx_sources) \
--	$(cairo_gobject_cxx_sources) $(cairo_trace_cxx_sources) \
--	$(cairo_interpreter_cxx_sources) \
--	$(cairo_symbol_lookup_cxx_sources)
--all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \
--	$(cairo_xlib_xrender_sources) $(cairo_xcb_sources) \
--	$(cairo_xlib_xcb_sources) $(cairo_xcb_shm_sources) \
--	$(cairo_qt_sources) $(cairo_quartz_sources) \
--	$(cairo_quartz_font_sources) $(cairo_quartz_image_sources) \
--	$(cairo_win32_sources) $(cairo_win32_font_sources) \
--	$(cairo_skia_sources) $(cairo_os2_sources) \
--	$(cairo_beos_sources) $(cairo_drm_sources) \
--	$(cairo_drm_xr_sources) $(cairo_gallium_sources) \
--	$(cairo_xcb_drm_sources) $(cairo_png_sources) \
--	$(cairo_gl_sources) $(cairo_directfb_sources) \
--	$(cairo_vg_sources) $(cairo_egl_sources) $(cairo_glx_sources) \
--	$(cairo_wgl_sources) $(cairo_script_sources) \
--	$(cairo_ft_sources) $(cairo_fc_sources) $(cairo_ps_sources) \
--	$(cairo_pdf_sources) $(cairo_svg_sources) \
--	$(cairo_test_surfaces_sources) $(cairo_image_sources) \
--	$(cairo_recording_sources) $(cairo_tee_sources) \
--	$(cairo_xml_sources) $(cairo_user_sources) \
--	$(cairo_pthread_sources) $(cairo_gobject_sources) \
--	$(cairo_trace_sources) $(cairo_interpreter_sources) \
--	$(cairo_symbol_lookup_sources)
--enabled_cairo_headers = $(cairo_headers) $(am__append_3) \
--	$(am__append_8) $(am__append_13) $(am__append_18) \
--	$(am__append_23) $(am__append_28) $(am__append_33) \
--	$(am__append_38) $(am__append_43) $(am__append_48) \
--	$(am__append_53) $(am__append_58) $(am__append_63) \
--	$(am__append_68) $(am__append_73) $(am__append_78) \
--	$(am__append_83) $(am__append_88) $(am__append_93) \
--	$(am__append_98) $(am__append_103) $(am__append_108) \
--	$(am__append_113) $(am__append_118) $(am__append_123) \
--	$(am__append_128) $(am__append_133) $(am__append_138) \
--	$(am__append_143) $(am__append_148) $(am__append_153) \
--	$(cairo_image_headers) $(cairo_recording_headers) \
--	$(am__append_161) $(am__append_166) $(cairo_user_headers) \
--	$(am__append_174)
--enabled_cairo_private = $(cairo_private) $(am__append_4) \
--	$(am__append_9) $(am__append_14) $(am__append_19) \
--	$(am__append_24) $(am__append_29) $(am__append_34) \
--	$(am__append_39) $(am__append_44) $(am__append_49) \
--	$(am__append_54) $(am__append_59) $(am__append_64) \
--	$(am__append_69) $(am__append_74) $(am__append_79) \
--	$(am__append_84) $(am__append_89) $(am__append_94) \
--	$(am__append_99) $(am__append_104) $(am__append_109) \
--	$(am__append_114) $(am__append_119) $(am__append_124) \
--	$(am__append_129) $(am__append_134) $(am__append_139) \
--	$(am__append_144) $(am__append_149) $(am__append_154) \
--	$(am__append_158) $(cairo_image_private) \
--	$(cairo_recording_private) $(am__append_162) $(am__append_167) \
--	$(cairo_user_private) $(am__append_171) $(am__append_175) \
--	$(am__append_179) $(am__append_182) $(am__append_185)
--enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \
--	$(am__append_10) $(am__append_15) $(am__append_20) \
--	$(am__append_25) $(am__append_30) $(am__append_35) \
--	$(am__append_40) $(am__append_45) $(am__append_50) \
--	$(am__append_55) $(am__append_60) $(am__append_65) \
--	$(am__append_70) $(am__append_75) $(am__append_80) \
--	$(am__append_85) $(am__append_90) $(am__append_95) \
--	$(am__append_100) $(am__append_105) $(am__append_110) \
--	$(am__append_115) $(am__append_120) $(am__append_125) \
--	$(am__append_130) $(am__append_135) $(am__append_140) \
--	$(am__append_145) $(am__append_150) $(am__append_155) \
--	$(am__append_159) $(cairo_image_cxx_sources) \
--	$(cairo_recording_cxx_sources) $(am__append_163) \
--	$(am__append_168) $(cairo_user_cxx_sources) $(am__append_172) \
--	$(am__append_176) $(am__append_180) $(am__append_183) \
--	$(am__append_186)
--enabled_cairo_sources = $(cairo_sources) $(am__append_6) \
--	$(am__append_11) $(am__append_16) $(am__append_21) \
--	$(am__append_26) $(am__append_31) $(am__append_36) \
--	$(am__append_41) $(am__append_46) $(am__append_51) \
--	$(am__append_56) $(am__append_61) $(am__append_66) \
--	$(am__append_71) $(am__append_76) $(am__append_81) \
--	$(am__append_86) $(am__append_91) $(am__append_96) \
--	$(am__append_101) $(am__append_106) $(am__append_111) \
--	$(am__append_116) $(am__append_121) $(am__append_126) \
--	$(am__append_131) $(am__append_136) $(am__append_141) \
--	$(am__append_146) $(am__append_151) $(am__append_156) \
--	$(am__append_160) $(cairo_image_sources) \
--	$(cairo_recording_sources) $(am__append_164) $(am__append_169) \
--	$(cairo_user_sources) $(am__append_173) $(am__append_177) \
--	$(am__append_181) $(am__append_184) $(am__append_187)
--all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \
--	cairo-xcb.pc cairo-xlib-xcb.pc cairo-xcb-shm.pc cairo-qt.pc \
--	cairo-quartz.pc cairo-quartz-font.pc cairo-quartz-image.pc \
--	cairo-win32.pc cairo-win32-font.pc cairo-skia.pc cairo-os2.pc \
--	cairo-beos.pc cairo-drm.pc cairo-drm-xr.pc cairo-gallium.pc \
--	cairo-xcb-drm.pc cairo-png.pc cairo-gl.pc cairo-directfb.pc \
--	cairo-vg.pc cairo-egl.pc cairo-glx.pc cairo-wgl.pc \
--	cairo-script.pc cairo-ft.pc cairo-fc.pc cairo-ps.pc \
--	cairo-pdf.pc cairo-svg.pc cairo-tee.pc cairo-xml.pc \
--	cairo-gobject.pc
--enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \
--	$(am__append_17) $(am__append_22) $(am__append_27) \
--	$(am__append_32) $(am__append_37) $(am__append_42) \
--	$(am__append_47) $(am__append_52) $(am__append_57) \
--	$(am__append_62) $(am__append_67) $(am__append_72) \
--	$(am__append_77) $(am__append_82) $(am__append_87) \
--	$(am__append_92) $(am__append_97) $(am__append_102) \
--	$(am__append_107) $(am__append_112) $(am__append_117) \
--	$(am__append_122) $(am__append_127) $(am__append_132) \
--	$(am__append_137) $(am__append_142) $(am__append_147) \
--	$(am__append_152) $(am__append_157) $(am__append_165) \
--	$(am__append_170) $(am__append_178)
- AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS)
- AM_LDFLAGS = $(CAIRO_LDFLAGS)
- @OS_WIN32_TRUE@export_symbols = -export-symbols cairo.def
-@@ -1494,8 +455,8 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
--.SUFFIXES: .c .cpp .i .lo .o .obj .s
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/Makefile.am.features $(top_srcdir)/src/Makefile.sources $(srcdir)/Makefile.am.analysis $(am__configure_deps)
-+.SUFFIXES: .c .i .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(srcdir)/Makefile.am.features $(srcdir)/Makefile.am.analysis $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -1520,9 +481,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- cairo.pc: $(top_builddir)/config.status $(srcdir)/cairo.pc.in
-@@ -1638,7 +599,7 @@
- libcairo.la: $(libcairo_la_OBJECTS) $(libcairo_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libcairo_la_LINK) -rpath $(libdir) $(libcairo_la_OBJECTS) $(libcairo_la_LIBADD) $(LIBS)
- libcairo_cxx.la: $(libcairo_cxx_la_OBJECTS) $(libcairo_cxx_la_DEPENDENCIES) 
--	$(AM_V_CXXLD)$(libcairo_cxx_la_LINK) $(am_libcairo_cxx_la_rpath) $(libcairo_cxx_la_OBJECTS) $(libcairo_cxx_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(libcairo_cxx_la_LINK) $(am_libcairo_cxx_la_rpath) $(libcairo_cxx_la_OBJECTS) $(libcairo_cxx_la_LIBADD) $(LIBS)
- 
- clean-checkPROGRAMS:
- 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-@@ -1658,157 +619,7 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-analysis-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-arc.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-array.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-atomic.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-base64-stream.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-base85-stream.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-bentley-ottmann-rectangular.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-bentley-ottmann-rectilinear.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-bentley-ottmann.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-beos-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-botor-scan-converter.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-boxes.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-cache.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-cff-subset.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-clip.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-color.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-composite-rectangles.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-debug.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-deflate-stream.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-device.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-directfb-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-bo.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-gallium-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i915-glyphs.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i915-shader.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i915-spans.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i915-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i965-glyphs.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i965-shader.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i965-spans.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-i965-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel-brw-eu-emit.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel-brw-eu-util.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel-brw-eu.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel-debug.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-intel.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-radeon-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-radeon.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm-xr.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-drm.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-egl-context.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-fixed.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-font-face-twin-data.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-font-face-twin.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-font-face.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-font-options.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-freed-pool.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-freelist.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-ft-font.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-composite.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-device.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-glyphs.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-gradient.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-shaders.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gl-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-glx-context.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-gstate.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-hash.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-hull.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-image-info.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-image-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-lzw.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-matrix.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-misc.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-mutex.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-observer.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-os2-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-output-stream.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-paginated-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path-bounds.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path-fill.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path-fixed.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path-in-fill.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path-stroke.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-path.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-pattern.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-pdf-operators.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-pdf-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-pen.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-png.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-polygon.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-ps-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-qt-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-quartz-font.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-quartz-image-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-quartz-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-recording-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-rectangle.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-rectangular-scan-converter.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-region.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-rtree.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-scaled-font-subsets.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-scaled-font.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-script-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-skia-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-slope.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-spans.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-spline.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-stroke-style.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-clipper.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-fallback.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-offset.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-snapshot.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-subsurface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface-wrapper.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-svg-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-system.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-tee-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-tor-scan-converter.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-toy-font-face.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-traps.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-truetype-subset.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-type1-fallback.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-type1-subset.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-type3-glyph-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-unicode.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-user-font.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-version.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-vg-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-wgl-context.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-wideint.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-win32-font.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-win32-printing-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-win32-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-connection-core.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-connection-render.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-connection-shm.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-connection.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-screen.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-shm.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-surface-cairo.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-surface-core.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-surface-render.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xcb-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xlib-display.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xlib-screen.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xlib-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xlib-visual.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xlib-xcb-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo-xml-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-link.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glew.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fallback-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fallback16-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-null-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-paginated-surface.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wrapping-surface.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1834,206 +645,6 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
--cairo-drm.lo: drm/cairo-drm.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm.lo -MD -MP -MF $(DEPDIR)/cairo-drm.Tpo -c -o cairo-drm.lo `test -f 'drm/cairo-drm.c' || echo '$(srcdir)/'`drm/cairo-drm.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm.Tpo $(DEPDIR)/cairo-drm.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm.c' object='cairo-drm.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm.lo `test -f 'drm/cairo-drm.c' || echo '$(srcdir)/'`drm/cairo-drm.c
--
--cairo-drm-bo.lo: drm/cairo-drm-bo.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-bo.lo -MD -MP -MF $(DEPDIR)/cairo-drm-bo.Tpo -c -o cairo-drm-bo.lo `test -f 'drm/cairo-drm-bo.c' || echo '$(srcdir)/'`drm/cairo-drm-bo.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-bo.Tpo $(DEPDIR)/cairo-drm-bo.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-bo.c' object='cairo-drm-bo.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-bo.lo `test -f 'drm/cairo-drm-bo.c' || echo '$(srcdir)/'`drm/cairo-drm-bo.c
--
--cairo-drm-surface.lo: drm/cairo-drm-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-surface.Tpo -c -o cairo-drm-surface.lo `test -f 'drm/cairo-drm-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-surface.Tpo $(DEPDIR)/cairo-drm-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-surface.c' object='cairo-drm-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-surface.lo `test -f 'drm/cairo-drm-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-surface.c
--
--cairo-drm-intel.lo: drm/cairo-drm-intel.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel.Tpo -c -o cairo-drm-intel.lo `test -f 'drm/cairo-drm-intel.c' || echo '$(srcdir)/'`drm/cairo-drm-intel.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel.Tpo $(DEPDIR)/cairo-drm-intel.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel.c' object='cairo-drm-intel.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel.lo `test -f 'drm/cairo-drm-intel.c' || echo '$(srcdir)/'`drm/cairo-drm-intel.c
--
--cairo-drm-intel-debug.lo: drm/cairo-drm-intel-debug.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel-debug.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel-debug.Tpo -c -o cairo-drm-intel-debug.lo `test -f 'drm/cairo-drm-intel-debug.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-debug.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel-debug.Tpo $(DEPDIR)/cairo-drm-intel-debug.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel-debug.c' object='cairo-drm-intel-debug.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel-debug.lo `test -f 'drm/cairo-drm-intel-debug.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-debug.c
--
--cairo-drm-intel-surface.lo: drm/cairo-drm-intel-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel-surface.Tpo -c -o cairo-drm-intel-surface.lo `test -f 'drm/cairo-drm-intel-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel-surface.Tpo $(DEPDIR)/cairo-drm-intel-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel-surface.c' object='cairo-drm-intel-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel-surface.lo `test -f 'drm/cairo-drm-intel-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-surface.c
--
--cairo-drm-i915-surface.lo: drm/cairo-drm-i915-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i915-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i915-surface.Tpo -c -o cairo-drm-i915-surface.lo `test -f 'drm/cairo-drm-i915-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i915-surface.Tpo $(DEPDIR)/cairo-drm-i915-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i915-surface.c' object='cairo-drm-i915-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i915-surface.lo `test -f 'drm/cairo-drm-i915-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-surface.c
--
--cairo-drm-i915-glyphs.lo: drm/cairo-drm-i915-glyphs.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i915-glyphs.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i915-glyphs.Tpo -c -o cairo-drm-i915-glyphs.lo `test -f 'drm/cairo-drm-i915-glyphs.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-glyphs.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i915-glyphs.Tpo $(DEPDIR)/cairo-drm-i915-glyphs.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i915-glyphs.c' object='cairo-drm-i915-glyphs.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i915-glyphs.lo `test -f 'drm/cairo-drm-i915-glyphs.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-glyphs.c
--
--cairo-drm-i915-shader.lo: drm/cairo-drm-i915-shader.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i915-shader.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i915-shader.Tpo -c -o cairo-drm-i915-shader.lo `test -f 'drm/cairo-drm-i915-shader.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-shader.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i915-shader.Tpo $(DEPDIR)/cairo-drm-i915-shader.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i915-shader.c' object='cairo-drm-i915-shader.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i915-shader.lo `test -f 'drm/cairo-drm-i915-shader.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-shader.c
--
--cairo-drm-i915-spans.lo: drm/cairo-drm-i915-spans.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i915-spans.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i915-spans.Tpo -c -o cairo-drm-i915-spans.lo `test -f 'drm/cairo-drm-i915-spans.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-spans.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i915-spans.Tpo $(DEPDIR)/cairo-drm-i915-spans.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i915-spans.c' object='cairo-drm-i915-spans.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i915-spans.lo `test -f 'drm/cairo-drm-i915-spans.c' || echo '$(srcdir)/'`drm/cairo-drm-i915-spans.c
--
--cairo-drm-i965-surface.lo: drm/cairo-drm-i965-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i965-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i965-surface.Tpo -c -o cairo-drm-i965-surface.lo `test -f 'drm/cairo-drm-i965-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i965-surface.Tpo $(DEPDIR)/cairo-drm-i965-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i965-surface.c' object='cairo-drm-i965-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i965-surface.lo `test -f 'drm/cairo-drm-i965-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-surface.c
--
--cairo-drm-i965-glyphs.lo: drm/cairo-drm-i965-glyphs.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i965-glyphs.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i965-glyphs.Tpo -c -o cairo-drm-i965-glyphs.lo `test -f 'drm/cairo-drm-i965-glyphs.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-glyphs.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i965-glyphs.Tpo $(DEPDIR)/cairo-drm-i965-glyphs.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i965-glyphs.c' object='cairo-drm-i965-glyphs.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i965-glyphs.lo `test -f 'drm/cairo-drm-i965-glyphs.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-glyphs.c
--
--cairo-drm-i965-shader.lo: drm/cairo-drm-i965-shader.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i965-shader.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i965-shader.Tpo -c -o cairo-drm-i965-shader.lo `test -f 'drm/cairo-drm-i965-shader.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-shader.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i965-shader.Tpo $(DEPDIR)/cairo-drm-i965-shader.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i965-shader.c' object='cairo-drm-i965-shader.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i965-shader.lo `test -f 'drm/cairo-drm-i965-shader.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-shader.c
--
--cairo-drm-i965-spans.lo: drm/cairo-drm-i965-spans.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-i965-spans.lo -MD -MP -MF $(DEPDIR)/cairo-drm-i965-spans.Tpo -c -o cairo-drm-i965-spans.lo `test -f 'drm/cairo-drm-i965-spans.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-spans.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-i965-spans.Tpo $(DEPDIR)/cairo-drm-i965-spans.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-i965-spans.c' object='cairo-drm-i965-spans.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-i965-spans.lo `test -f 'drm/cairo-drm-i965-spans.c' || echo '$(srcdir)/'`drm/cairo-drm-i965-spans.c
--
--cairo-drm-intel-brw-eu.lo: drm/cairo-drm-intel-brw-eu.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel-brw-eu.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel-brw-eu.Tpo -c -o cairo-drm-intel-brw-eu.lo `test -f 'drm/cairo-drm-intel-brw-eu.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel-brw-eu.Tpo $(DEPDIR)/cairo-drm-intel-brw-eu.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel-brw-eu.c' object='cairo-drm-intel-brw-eu.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel-brw-eu.lo `test -f 'drm/cairo-drm-intel-brw-eu.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu.c
--
--cairo-drm-intel-brw-eu-emit.lo: drm/cairo-drm-intel-brw-eu-emit.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel-brw-eu-emit.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel-brw-eu-emit.Tpo -c -o cairo-drm-intel-brw-eu-emit.lo `test -f 'drm/cairo-drm-intel-brw-eu-emit.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu-emit.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel-brw-eu-emit.Tpo $(DEPDIR)/cairo-drm-intel-brw-eu-emit.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel-brw-eu-emit.c' object='cairo-drm-intel-brw-eu-emit.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel-brw-eu-emit.lo `test -f 'drm/cairo-drm-intel-brw-eu-emit.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu-emit.c
--
--cairo-drm-intel-brw-eu-util.lo: drm/cairo-drm-intel-brw-eu-util.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-intel-brw-eu-util.lo -MD -MP -MF $(DEPDIR)/cairo-drm-intel-brw-eu-util.Tpo -c -o cairo-drm-intel-brw-eu-util.lo `test -f 'drm/cairo-drm-intel-brw-eu-util.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu-util.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-intel-brw-eu-util.Tpo $(DEPDIR)/cairo-drm-intel-brw-eu-util.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-intel-brw-eu-util.c' object='cairo-drm-intel-brw-eu-util.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-intel-brw-eu-util.lo `test -f 'drm/cairo-drm-intel-brw-eu-util.c' || echo '$(srcdir)/'`drm/cairo-drm-intel-brw-eu-util.c
--
--cairo-drm-radeon.lo: drm/cairo-drm-radeon.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-radeon.lo -MD -MP -MF $(DEPDIR)/cairo-drm-radeon.Tpo -c -o cairo-drm-radeon.lo `test -f 'drm/cairo-drm-radeon.c' || echo '$(srcdir)/'`drm/cairo-drm-radeon.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-radeon.Tpo $(DEPDIR)/cairo-drm-radeon.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-radeon.c' object='cairo-drm-radeon.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-radeon.lo `test -f 'drm/cairo-drm-radeon.c' || echo '$(srcdir)/'`drm/cairo-drm-radeon.c
--
--cairo-drm-radeon-surface.lo: drm/cairo-drm-radeon-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-radeon-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-radeon-surface.Tpo -c -o cairo-drm-radeon-surface.lo `test -f 'drm/cairo-drm-radeon-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-radeon-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-radeon-surface.Tpo $(DEPDIR)/cairo-drm-radeon-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-radeon-surface.c' object='cairo-drm-radeon-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-radeon-surface.lo `test -f 'drm/cairo-drm-radeon-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-radeon-surface.c
--
--cairo-drm-xr.lo: drm/cairo-drm-xr.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-xr.lo -MD -MP -MF $(DEPDIR)/cairo-drm-xr.Tpo -c -o cairo-drm-xr.lo `test -f 'drm/cairo-drm-xr.c' || echo '$(srcdir)/'`drm/cairo-drm-xr.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-xr.Tpo $(DEPDIR)/cairo-drm-xr.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-xr.c' object='cairo-drm-xr.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-xr.lo `test -f 'drm/cairo-drm-xr.c' || echo '$(srcdir)/'`drm/cairo-drm-xr.c
--
--cairo-drm-gallium-surface.lo: drm/cairo-drm-gallium-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo-drm-gallium-surface.lo -MD -MP -MF $(DEPDIR)/cairo-drm-gallium-surface.Tpo -c -o cairo-drm-gallium-surface.lo `test -f 'drm/cairo-drm-gallium-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-gallium-surface.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo-drm-gallium-surface.Tpo $(DEPDIR)/cairo-drm-gallium-surface.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drm/cairo-drm-gallium-surface.c' object='cairo-drm-gallium-surface.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo-drm-gallium-surface.lo `test -f 'drm/cairo-drm-gallium-surface.c' || echo '$(srcdir)/'`drm/cairo-drm-gallium-surface.c
--
--glew.lo: glew/glew.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.lo -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.lo `test -f 'glew/glew.c' || echo '$(srcdir)/'`glew/glew.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Plo
--@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glew/glew.c' object='glew.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.lo `test -f 'glew/glew.c' || echo '$(srcdir)/'`glew/glew.c
--
--.cpp.o:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
--
--.cpp.obj:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
--
--.cpp.lo:
--@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
--@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
--
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-Index: cairo/test/Makefile.in
-===================================================================
---- cairo.orig/test/Makefile.in	2010-09-06 23:50:26.095419617 +0200
-+++ cairo/test/Makefile.in	2010-09-06 23:50:09.472409087 +0200
-@@ -789,6 +789,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -878,6 +879,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -2540,7 +2542,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(top_srcdir)/test/Makefile.sources $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(top_srcdir)/test/Makefile.sources $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -2565,9 +2567,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
-Index: cairo/test/pdiff/Makefile.in
-===================================================================
---- cairo.orig/test/pdiff/Makefile.in	2010-09-06 23:50:21.331420067 +0200
-+++ cairo/test/pdiff/Makefile.in	2010-09-06 23:50:09.560407142 +0200
-@@ -193,6 +193,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -282,6 +283,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -349,7 +351,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -374,9 +376,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
-Index: cairo/util/Makefile.in
-===================================================================
---- cairo.orig/util/Makefile.in	2010-09-06 23:50:20.907409613 +0200
-+++ cairo/util/Makefile.in	2010-09-06 23:50:09.720407283 +0200
-@@ -279,6 +279,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -368,6 +369,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -449,7 +451,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .la .lo .o .obj .so
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -474,9 +476,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- backtrace-symbols.la: $(backtrace_symbols_la_OBJECTS) $(backtrace_symbols_la_DEPENDENCIES) 
-Index: cairo/util/cairo-fdr/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-fdr/Makefile.in	2010-09-06 23:50:20.863415541 +0200
-+++ cairo/util/cairo-fdr/Makefile.in	2010-09-06 23:50:09.808406878 +0200
-@@ -207,6 +207,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -296,6 +297,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -353,7 +355,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -378,9 +380,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- install-cairolibLTLIBRARIES: $(cairolib_LTLIBRARIES)
-Index: cairo/util/cairo-gobject/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-gobject/Makefile.in	2010-09-06 23:50:20.555409288 +0200
-+++ cairo/util/cairo-gobject/Makefile.in	2010-09-06 23:50:09.896406334 +0200
-@@ -215,6 +215,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -304,6 +305,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -361,7 +363,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -386,9 +388,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-Index: cairo/util/cairo-script/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-script/Makefile.in	2010-09-06 23:50:20.747409311 +0200
-+++ cairo/util/cairo-script/Makefile.in	2010-09-06 23:50:10.024408015 +0200
-@@ -288,6 +288,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -377,6 +378,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -451,7 +453,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -476,9 +478,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-Index: cairo/util/cairo-script/examples/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-script/examples/Makefile.in	2010-09-06 23:50:20.655439175 +0200
-+++ cairo/util/cairo-script/examples/Makefile.in	2010-09-06 23:50:10.088406230 +0200
-@@ -152,6 +152,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -241,6 +242,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -296,7 +298,7 @@
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -321,9 +323,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
-Index: cairo/util/cairo-sphinx/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-sphinx/Makefile.in	2010-09-06 23:50:20.811407533 +0200
-+++ cairo/util/cairo-sphinx/Makefile.in	2010-09-06 23:50:10.184407597 +0200
-@@ -217,6 +217,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -306,6 +307,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -380,7 +382,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -405,9 +407,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- install-cairolibLTLIBRARIES: $(cairolib_LTLIBRARIES)
-Index: cairo/util/cairo-trace/Makefile.in
-===================================================================
---- cairo.orig/util/cairo-trace/Makefile.in	2010-09-06 23:50:20.467408854 +0200
-+++ cairo/util/cairo-trace/Makefile.in	2010-09-06 23:50:10.292406590 +0200
-@@ -225,6 +225,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- LTP = @LTP@
- LTP_GENHTML = @LTP_GENHTML@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -314,6 +315,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mesa_DIR = @mesa_DIR@
- mkdir_p = @mkdir_p@
-@@ -379,7 +381,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -404,9 +406,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- cairo-trace: $(top_builddir)/config.status $(srcdir)/cairo-trace.in
diff --git a/debian/patches/series b/debian/patches/series
index 29d3f29..8606a57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01_build_perf_utils.patch
 02_am-maintainer-mode.patch
-99_autoreconf.patch
-99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index fc72c9f..d48b00d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ configure_flags += \
 --enable-xlib \
 --enable-png \
 --disable-silent-rules \
+--disable-maintainer-mode \
 --build=$(DEB_BUILD_GNU_TYPE)
 
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@ -83,6 +84,8 @@ configure-common-stamp:
 	# Generated by configure and breaks the build if already existing
 	-test -r src/cairo-features.h && \
 	  mv src/cairo-features.h src/cairo-features.h.orig
+	dh_autoreconf
+	patch -Np1 < debian/ltmain_as-needed.patch
 	touch $@
 
 configure-stamp-%: configure-common-stamp
@@ -106,8 +109,10 @@ clean:
 	dh_testdir
 	dh_testroot
 	[ ! -r src/cairo-features.h.orig ] || mv -f src/cairo-features.h.orig src/cairo-features.h
+	[ ! -r configure-common-stamp ] || patch -NRp1 < debian/ltmain_as-needed.patch
 	rm -f *-stamp
 	rm -rf $(buildbasedir) $(installbasedir)
+	dh_autoreconf_clean
 	dh_clean
 
 install-%: build-stamp-%