diff --git a/x11-libs/cairo/cairo-1.12.18.recipe b/x11-libs/cairo/cairo-1.12.18.recipe
new file mode 100644
index 000000000..7a716da4e
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.18.recipe
@@ -0,0 +1,109 @@
+SUMMARY="Multi-platform 2D graphics library"
+DESCRIPTION="
+Cairo is a 2D graphics library with support for multiple output \
+devices. Currently supported output targets include the X Window \
+System (via both Xlib and XCB), quartz, win32, and image buffers, \
+as well as PDF, PostScript, and SVG file output. Experimental backends \
+include OpenGL, BeOS, OS/2, and DirectFB.
+"
+HOMEPAGE="http://cairographics.org"
+COPYRIGHT="
+	2000, 2002, 2004-2007 Keith Packard
+	2002-2003 University of Southern California
+	2004-2010 Red Hat, Inc.
+	2005-2010 Mozilla Corporation
+	2006-2009 Adrian Johnson
+	2007-2009 Chris Wilson
+	2006-2013 Intel Corporation
+	2011 Andrea Canciani
+	2011 Samsung Electronics
+	2010-2011 Linaro Limited
+	2009-2010 Eric Anholt
+	2002-2010 many others
+	"
+LICENSE="
+GNU LGPL v2.1
+MPL v1.1
+"
+SRC_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
+CHECKSUM_SHA256="dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PATCHES="cairo-$portVersion.patchset"
+
+PROVIDES="
+	cairo$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libcairo$secondaryArchSuffix = 2.11200.18 compat >= 2
+	lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libpixman_1$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	# required by fontconfig
+	lib:libbz2$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libgcc_s$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libfontconfig$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libpixman_1$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	# required by fontconfig
+	devel:libbz2$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	export CFLAGS=-D__BSD_VISIBLE
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libcairo libcairo-script-interpreter
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libcairo$secondaryArchSuffix = 2.11200.18 compat >= 2
+	devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2
+	"
+REQUIRES_devel="
+	cairo$secondaryArchSuffix == $portVersion base
+	"
diff --git a/x11-libs/cairo/patches/cairo-1.12.18.patchset b/x11-libs/cairo/patches/cairo-1.12.18.patchset
new file mode 100644
index 000000000..cdeb71041
--- /dev/null
+++ b/x11-libs/cairo/patches/cairo-1.12.18.patchset
@@ -0,0 +1,1709 @@
+From 864d497da945343f42df0582c3057067088548b3 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 3 Oct 2014 18:33:08 +0000
+Subject: Haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index a04baae..8942dc2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -287,6 +287,11 @@ CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [
+       AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
+       AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta")
+       ;;
++    *-*-haiku)
++      beos_LIBS=""
++      AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
++      AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork")
++      ;;
+     *)
+       use_beos="no (requires a BeOS platform)"
+       ;;
+-- 
+1.8.3.4
+
+
+From dcd5cb8da9ff9796b032b1435ddf3ffc42478bab Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Mon, 6 Oct 2014 18:07:36 +0200
+Subject: Add missing include fenv.h.
+
+
+diff --git a/test/cairo-test.c b/test/cairo-test.c
+index a3a587a..e5b2945 100644
+--- a/test/cairo-test.c
++++ b/test/cairo-test.c
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ #endif
+ #include <errno.h>
++#include <fenv.h>
+ #include <string.h>
+ #if HAVE_FCFINI
+ #include <fontconfig/fontconfig.h>
+-- 
+1.8.3.4
+
+
+From de5191ac6cc0d97f16500280aa6bfc49d4c0e23b Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 21 Nov 2014 22:11:40 +0000
+Subject: link tests against libnetwork.
+
+
+diff --git a/perf/Makefile.am b/perf/Makefile.am
+index 92f0dfc..7ed5a5d 100644
+--- a/perf/Makefile.am
++++ b/perf/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS =					\
+ 	-I$(top_builddir)/src			\
+ 	$(CAIRO_CFLAGS)
+ 
+-AM_LDFLAGS = $(CAIRO_LDFLAGS)
++AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork
+ 
+ SUBDIRS = micro
+ 
+diff --git a/test/Makefile.am b/test/Makefile.am
+index a9495dc..f20d5be 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -90,7 +90,7 @@ cairo_test_suite_LDADD = 					\
+ 	$(top_builddir)/test/pdiff/libpdiff.la 			\
+         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
+ 	$(top_builddir)/src/libcairo.la 			\
+-	$(CAIRO_LDADD)
++	$(CAIRO_LDADD) -lnetwork
+ cairo_test_suite_DEPENDENCIES = \
+ 	$(top_builddir)/test/pdiff/libpdiff.la 			\
+         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
+@@ -279,7 +279,7 @@ AM_CPPFLAGS =					\
+ 	-I$(top_srcdir)/src			\
+ 	-I$(top_builddir)/src			\
+ 	$(CAIRO_CFLAGS)
+-AM_LDFLAGS = $(CAIRO_LDFLAGS)
++AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork
+ 
+ $(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la
+ 	cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
+diff --git a/test/Makefile.in b/test/Makefile.in
+index eaa046e..631e720 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.3 from Makefile.am.
++# Makefile.in generated by automake 1.13.1 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +16,23 @@
+ 
+ 
+ VPATH = @srcdir@
++am__make_dryrun = \
++  { \
++    am__dry=no; \
++    case $$MAKEFLAGS in \
++      *\\[\ \	]*) \
++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++      *) \
++        for am__flg in $$MAKEFLAGS; do \
++          case $$am__flg in \
++            *=*|--*) ;; \
++            *n*) am__dry=yes; break;; \
++          esac; \
++        done;; \
++    esac; \
++    test $$am__dry = yes; \
++  }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -35,9 +51,10 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/build/Makefile.am.common \
+-	$(top_srcdir)/test/Makefile.sources COPYING
++DIST_COMMON = $(top_srcdir)/build/Makefile.am.common \
++	$(top_srcdir)/test/Makefile.sources $(srcdir)/Makefile.in \
++	$(srcdir)/Makefile.am $(top_srcdir)/build/depcomp \
++	$(top_srcdir)/build/test-driver COPYING README
+ EXTRA_PROGRAMS = $(am__EXEEXT_1) imagediff$(EXEEXT) \
+ 	png-flatten$(EXEEXT) $(TESTS)
+ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
+@@ -121,6 +138,7 @@ am__DEPENDENCIES_1 =
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
++am__v_lt_1 = 
+ any2ppm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(any2ppm_CFLAGS) \
+ 	$(CFLAGS) $(any2ppm_LDFLAGS) $(LDFLAGS) -o $@
+@@ -750,6 +768,18 @@ svg2png_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(svg2png_CFLAGS) \
+ 	$(CFLAGS) $(svg2png_LDFLAGS) $(LDFLAGS) -o $@
+ SCRIPTS = $(noinst_SCRIPTS)
++AM_V_P = $(am__v_P_@AM_V@)
++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_@AM_V@)
++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
++am__v_GEN_0 = @echo "  GEN     " $@;
++am__v_GEN_1 = 
++AM_V_at = $(am__v_at_@AM_V@)
++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build/depcomp
+ am__depfiles_maybe = depfiles
+@@ -762,42 +792,265 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+-am__v_CC_0 = @echo "  CC    " $@;
+-AM_V_at = $(am__v_at_@AM_V@)
+-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+-am__v_at_0 = @
++am__v_CC_0 = @echo "  CC      " $@;
++am__v_CC_1 = 
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+-am__v_CCLD_0 = @echo "  CCLD  " $@;
+-AM_V_GEN = $(am__v_GEN_@AM_V@)
+-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+-am__v_GEN_0 = @echo "  GEN   " $@;
++am__v_CCLD_0 = @echo "  CCLD    " $@;
++am__v_CCLD_1 = 
+ SOURCES = any2ppm.c $(cairo_test_suite_SOURCES) \
+ 	$(cairo_test_trace_SOURCES) $(imagediff_SOURCES) pdf2png.c \
+ 	$(png_flatten_SOURCES) ps2png.c svg2png.c
+ DIST_SOURCES = any2ppm.c $(am__cairo_test_suite_SOURCES_DIST) \
+ 	$(am__cairo_test_trace_SOURCES_DIST) $(imagediff_SOURCES) \
+ 	pdf2png.c $(png_flatten_SOURCES) ps2png.c svg2png.c
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-dvi-recursive install-exec-recursive \
+-	install-html-recursive install-info-recursive \
+-	install-pdf-recursive install-ps-recursive install-recursive \
+-	installcheck-recursive installdirs-recursive pdf-recursive \
+-	ps-recursive uninstall-recursive
++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
++	ctags-recursive dvi-recursive html-recursive info-recursive \
++	install-data-recursive install-dvi-recursive \
++	install-exec-recursive install-html-recursive \
++	install-info-recursive install-pdf-recursive \
++	install-ps-recursive install-recursive installcheck-recursive \
++	installdirs-recursive pdf-recursive ps-recursive \
++	tags-recursive uninstall-recursive
++am__can_run_installinfo = \
++  case $$AM_UPDATE_INFO_DIR in \
++    n|no|NO) false;; \
++    *) (install-info --version) >/dev/null 2>&1;; \
++  esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+-	distdir
++am__recursive_targets = \
++  $(RECURSIVE_TARGETS) \
++  $(RECURSIVE_CLEAN_TARGETS) \
++  $(am__extra_recursive_targets)
++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
++	check recheck distdir
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++# Read a list of newline-separated strings from the standard input,
++# and print each of them once, without duplicates.  Input order is
++# *not* preserved.
++am__uniquify_input = $(AWK) '\
++  BEGIN { nonempty = 0; } \
++  { items[$$0] = 1; nonempty = 1; } \
++  END { if (nonempty) { for (i in items) print i; }; } \
++'
++# Make sure the list of sources is unique.  This is necessary because,
++# e.g., the same source file might be shared among _SOURCES variables
++# for different programs/libraries.
++am__define_uniq_tagged_files = \
++  list='$(am__tagged_files)'; \
++  unique=`for i in $$list; do \
++    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++  done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-am__tty_colors = \
+-red=; grn=; lgn=; blu=; std=
++am__tty_colors_dummy = \
++  mgn= red= grn= lgn= blu= brg= std=; \
++  am__color_tests=no
++am__tty_colors = { \
++  $(am__tty_colors_dummy); \
++  if test "X$(AM_COLOR_TESTS)" = Xno; then \
++    am__color_tests=no; \
++  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
++    am__color_tests=yes; \
++  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
++    am__color_tests=yes; \
++  fi; \
++  if test $$am__color_tests = yes; then \
++    red=''; \
++    grn=''; \
++    lgn=''; \
++    blu=''; \
++    mgn=''; \
++    brg=''; \
++    std=''; \
++  fi; \
++}
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
++am__recheck_rx = ^[ 	]*:recheck:[ 	]*
++am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
++am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
++# A command that, given a newline-separated list of test names on the
++# standard input, print the name of the tests that are to be re-run
++# upon "make recheck".
++am__list_recheck_tests = $(AWK) '{ \
++  recheck = 1; \
++  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
++    { \
++      if (rc < 0) \
++        { \
++          if ((getline line2 < ($$0 ".log")) < 0) \
++	    recheck = 0; \
++          break; \
++        } \
++      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
++        { \
++          recheck = 0; \
++          break; \
++        } \
++      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
++        { \
++          break; \
++        } \
++    }; \
++  if (recheck) \
++    print $$0; \
++  close ($$0 ".trs"); \
++  close ($$0 ".log"); \
++}'
++# A command that, given a newline-separated list of test names on the
++# standard input, create the global log from their .trs and .log files.
++am__create_global_log = $(AWK) ' \
++function fatal(msg) \
++{ \
++  print "fatal: making $@: " msg | "cat >&2"; \
++  exit 1; \
++} \
++function rst_section(header) \
++{ \
++  print header; \
++  len = length(header); \
++  for (i = 1; i <= len; i = i + 1) \
++    printf "="; \
++  printf "\n\n"; \
++} \
++{ \
++  copy_in_global_log = 1; \
++  global_test_result = "RUN"; \
++  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
++    { \
++      if (rc < 0) \
++         fatal("failed to read from " $$0 ".trs"); \
++      if (line ~ /$(am__global_test_result_rx)/) \
++        { \
++          sub("$(am__global_test_result_rx)", "", line); \
++          sub("[ 	]*$$", "", line); \
++          global_test_result = line; \
++        } \
++      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
++        copy_in_global_log = 0; \
++    }; \
++  if (copy_in_global_log) \
++    { \
++      rst_section(global_test_result ": " $$0); \
++      while ((rc = (getline line < ($$0 ".log"))) != 0) \
++      { \
++        if (rc < 0) \
++          fatal("failed to read from " $$0 ".log"); \
++        print line; \
++      }; \
++      printf "\n"; \
++    }; \
++  close ($$0 ".trs"); \
++  close ($$0 ".log"); \
++}'
++# Restructured Text title.
++am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
++# Solaris 10 'make', and several other traditional 'make' implementations,
++# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
++# by disabling -e (using the XSI extension "set +e") if it's set.
++am__sh_e_setup = case $$- in *e*) set +e;; esac
++# Default flags passed to test drivers.
++am__common_driver_flags = \
++  --color-tests "$$am__color_tests" \
++  --enable-hard-errors "$$am__enable_hard_errors" \
++  --expect-failure "$$am__expect_failure"
++# To be inserted before the command running the test.  Creates the
++# directory for the log if needed.  Stores in $dir the directory
++# containing $f, in $tst the test, in $log the log.  Executes the
++# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
++# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
++# will run the test scripts (or their associated LOG_COMPILER, if
++# thy have one).
++am__check_pre = \
++$(am__sh_e_setup);					\
++$(am__vpath_adj_setup) $(am__vpath_adj)			\
++$(am__tty_colors);					\
++srcdir=$(srcdir); export srcdir;			\
++case "$@" in						\
++  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
++    *) am__odir=.;; 					\
++esac;							\
++test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
++  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
++if test -f "./$$f"; then dir=./;			\
++elif test -f "$$f"; then dir=;				\
++else dir="$(srcdir)/"; fi;				\
++tst=$$dir$$f; log='$@'; 				\
++if test -n '$(DISABLE_HARD_ERRORS)'; then		\
++  am__enable_hard_errors=no; 				\
++else							\
++  am__enable_hard_errors=yes; 				\
++fi; 							\
++case " $(XFAIL_TESTS) " in				\
++  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
++    am__expect_failure=yes;;				\
++  *)							\
++    am__expect_failure=no;;				\
++esac; 							\
++$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
++# A shell command to get the names of the tests scripts with any registered
++# extension removed (i.e., equivalently, the names of the test logs, with
++# the '.log' extension removed).  The result is saved in the shell variable
++# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
++# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
++# since that might cause problem with VPATH rewrites for suffix-less tests.
++# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
++am__set_TESTS_bases = \
++  bases='$(TEST_LOGS)'; \
++  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
++  bases=`echo $$bases`
++RECHECK_LOGS = $(TEST_LOGS)
++TEST_SUITE_LOG = test-suite.log
++TEST_EXTENSIONS = @EXEEXT@ .test
++LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
++LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
++am__set_b = \
++  case '$@' in \
++    */*) \
++      case '$*' in \
++        */*) b='$*';; \
++          *) b=`echo '$@' | sed 's/\.log$$//'`; \
++       esac;; \
++    *) \
++      b='$*';; \
++  esac
++am__test_logs1 = $(TESTS:=.log)
++am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
++TEST_LOGS = $(am__test_logs2:.test.log=.log)
++TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
++TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
++	$(TEST_LOG_FLAGS)
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+@@ -1408,7 +1661,7 @@ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
+-.SUFFIXES: .c .lo .o .obj
++.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+ $(srcdir)/Makefile.in:  $(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 \
+@@ -7761,12 +8014,12 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-#     (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-$(RECURSIVE_TARGETS):
++# into them and run 'make' without going through this Makefile.
++# To change the values of 'make' variables: instead of editing Makefiles,
++# (1) if the variable is set in 'config.status', edit 'config.status'
++#     (which will cause the Makefiles to be regenerated when you run 'make');
++# (2) otherwise, pass the desired values on the 'make' command line.
++$(am__recursive_targets):
+ 	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -7776,7 +8029,11 @@ $(RECURSIVE_TARGETS):
+ 	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	for subdir in $$list; do \
+ 	  echo "Making $$target in $$subdir"; \
+ 	  if test "$$subdir" = "."; then \
+ 	    dot_seen=yes; \
+@@ -7791,57 +8048,12 @@ $(RECURSIVE_TARGETS):
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-$(RECURSIVE_CLEAN_TARGETS):
+-	@fail= failcom='exit 1'; \
+-	for f in x $$MAKEFLAGS; do \
+-	  case $$f in \
+-	    *=* | --[!k]*);; \
+-	    *k*) failcom='fail=yes';; \
+-	  esac; \
+-	done; \
+-	dot_seen=no; \
+-	case "$@" in \
+-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+-	  *) list='$(SUBDIRS)' ;; \
+-	esac; \
+-	rev=''; for subdir in $$list; do \
+-	  if test "$$subdir" = "."; then :; else \
+-	    rev="$$subdir $$rev"; \
+-	  fi; \
+-	done; \
+-	rev="$$rev ."; \
+-	target=`echo $@ | sed s/-recursive//`; \
+-	for subdir in $$rev; do \
+-	  echo "Making $$target in $$subdir"; \
+-	  if test "$$subdir" = "."; then \
+-	    local_target="$$target-am"; \
+-	  else \
+-	    local_target="$$target"; \
+-	  fi; \
+-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	  || eval $$failcom; \
+-	done && test -z "$$fail"
+-tags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+-	done
+-ctags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+-	done
++ID: $(am__tagged_files)
++	$(am__define_uniq_tagged_files); mkid -fID $$unique
++tags: tags-recursive
++TAGS: tags
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	mkid -fID $$unique
+-tags: TAGS
+-
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ 	set x; \
+ 	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+@@ -7857,12 +8069,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++	$(am__define_uniq_tagged_files); \
+ 	shift; \
+ 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+@@ -7874,15 +8081,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 	      $$unique; \
+ 	  fi; \
+ 	fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++ctags: ctags-recursive
++
++CTAGS: ctags
++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++	$(am__define_uniq_tagged_files); \
+ 	test -z "$(CTAGS_ARGS)$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$unique
+@@ -7891,102 +8094,176 @@ GTAGS:
+ 	here=`$(am__cd) $(top_builddir) && pwd` \
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
++cscopelist: cscopelist-recursive
++
++cscopelist-am: $(am__tagged_files)
++	list='$(am__tagged_files)'; \
++	case "$(srcdir)" in \
++	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
++	  *) sdir=$(subdir)/$(srcdir) ;; \
++	esac; \
++	for i in $$list; do \
++	  if test -f "$$i"; then \
++	    echo "$(subdir)/$$i"; \
++	  else \
++	    echo "$$sdir/$$i"; \
++	  fi; \
++	done >> $(top_builddir)/cscope.files
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+-check-TESTS: $(TESTS)
+-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+-	srcdir=$(srcdir); export srcdir; \
+-	list=' $(TESTS) '; \
+-	$(am__tty_colors); \
+-	if test -n "$$list"; then \
+-	  for tst in $$list; do \
+-	    if test -f ./$$tst; then dir=./; \
+-	    elif test -f $$tst; then dir=; \
+-	    else dir="$(srcdir)/"; fi; \
+-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+-	      all=`expr $$all + 1`; \
+-	      case " $(XFAIL_TESTS) " in \
+-	      *[\ \	]$$tst[\ \	]*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		col=$$red; res=XPASS; \
+-	      ;; \
+-	      *) \
+-		col=$$grn; res=PASS; \
+-	      ;; \
+-	      esac; \
+-	    elif test $$? -ne 77; then \
+-	      all=`expr $$all + 1`; \
+-	      case " $(XFAIL_TESTS) " in \
+-	      *[\ \	]$$tst[\ \	]*) \
+-		xfail=`expr $$xfail + 1`; \
+-		col=$$lgn; res=XFAIL; \
+-	      ;; \
+-	      *) \
+-		failed=`expr $$failed + 1`; \
+-		col=$$red; res=FAIL; \
+-	      ;; \
+-	      esac; \
+-	    else \
+-	      skip=`expr $$skip + 1`; \
+-	      col=$$blu; res=SKIP; \
+-	    fi; \
+-	    echo "$${col}$$res$${std}: $$tst"; \
+-	  done; \
+-	  if test "$$all" -eq 1; then \
+-	    tests="test"; \
+-	    All=""; \
+-	  else \
+-	    tests="tests"; \
+-	    All="All "; \
++# Recover from deleted '.trs' file; this should ensure that
++# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
++# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
++# to avoid problems with "make -n".
++.log.trs:
++	rm -f $< $@
++	$(MAKE) $(AM_MAKEFLAGS) $<
++
++# Leading 'am--fnord' is there to ensure the list of targets does not
++# exand to empty, as could happen e.g. with make check TESTS=''.
++am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
++am--force-recheck:
++	@:
++
++$(TEST_SUITE_LOG): $(TEST_LOGS)
++	@$(am__set_TESTS_bases); \
++	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
++	redo_bases=`for i in $$bases; do \
++	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
++	            done`; \
++	if test -n "$$redo_bases"; then \
++	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
++	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
++	  if $(am__make_dryrun); then :; else \
++	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+ 	  fi; \
+-	  if test "$$failed" -eq 0; then \
+-	    if test "$$xfail" -eq 0; then \
+-	      banner="$$All$$all $$tests passed"; \
+-	    else \
+-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+-	    fi; \
+-	  else \
+-	    if test "$$xpass" -eq 0; then \
+-	      banner="$$failed of $$all $$tests failed"; \
++	fi; \
++	if test -n "$$am__remaking_logs"; then \
++	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
++	       "recursion detected" >&2; \
++	else \
++	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
++	fi; \
++	if $(am__make_dryrun); then :; else \
++	  st=0;  \
++	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
++	  for i in $$redo_bases; do \
++	    test -f $$i.trs && test -r $$i.trs \
++	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
++	    test -f $$i.log && test -r $$i.log \
++	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
++	  done; \
++	  test $$st -eq 0 || exit 1; \
++	fi
++	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
++	ws='[ 	]'; \
++	results=`for b in $$bases; do echo $$b.trs; done`; \
++	test -n "$$results" || results=/dev/null; \
++	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
++	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
++	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
++	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
++	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
++	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
++	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
++	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
++	  success=true; \
++	else \
++	  success=false; \
++	fi; \
++	br='==================='; br=$$br$$br$$br$$br; \
++	result_count () \
++	{ \
++	    if test x"$$1" = x"--maybe-color"; then \
++	      maybe_colorize=yes; \
++	    elif test x"$$1" = x"--no-color"; then \
++	      maybe_colorize=no; \
+ 	    else \
+-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+ 	    fi; \
+-	  fi; \
+-	  dashes="$$banner"; \
+-	  skipped=""; \
+-	  if test "$$skip" -ne 0; then \
+-	    if test "$$skip" -eq 1; then \
+-	      skipped="($$skip test was not run)"; \
++	    shift; \
++	    desc=$$1 count=$$2; \
++	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
++	      color_start=$$3 color_end=$$std; \
+ 	    else \
+-	      skipped="($$skip tests were not run)"; \
++	      color_start= color_end=; \
+ 	    fi; \
+-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+-	      dashes="$$skipped"; \
+-	  fi; \
+-	  report=""; \
+-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+-	      dashes="$$report"; \
+-	  fi; \
+-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+-	  if test "$$failed" -eq 0; then \
+-	    col="$$grn"; \
+-	  else \
+-	    col="$$red"; \
+-	  fi; \
+-	  echo "$${col}$$dashes$${std}"; \
+-	  echo "$${col}$$banner$${std}"; \
+-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+-	  echo "$${col}$$dashes$${std}"; \
+-	  test "$$failed" -eq 0; \
+-	else :; fi
++	    echo "$${color_start}# $$desc $$count$${color_end}"; \
++	}; \
++	create_testsuite_report () \
++	{ \
++	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
++	  result_count $$1 "PASS: " $$pass  "$$grn"; \
++	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
++	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
++	  result_count $$1 "FAIL: " $$fail  "$$red"; \
++	  result_count $$1 "XPASS:" $$xpass "$$red"; \
++	  result_count $$1 "ERROR:" $$error "$$mgn"; \
++	}; \
++	{								\
++	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
++	    $(am__rst_title);						\
++	  create_testsuite_report --no-color;				\
++	  echo;								\
++	  echo ".. contents:: :depth: 2";				\
++	  echo;								\
++	  for b in $$bases; do echo $$b; done				\
++	    | $(am__create_global_log);					\
++	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
++	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
++	if $$success; then						\
++	  col="$$grn";							\
++	 else								\
++	  col="$$red";							\
++	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
++	fi;								\
++	echo "$${col}$$br$${std}"; 					\
++	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
++	echo "$${col}$$br$${std}"; 					\
++	create_testsuite_report --maybe-color;				\
++	echo "$$col$$br$$std";						\
++	if $$success; then :; else					\
++	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
++	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
++	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
++	  fi;								\
++	  echo "$$col$$br$$std";					\
++	fi;								\
++	$$success || exit 1
++
++check-TESTS:
++	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
++	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
++	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
++	@set +e; $(am__set_TESTS_bases); \
++	log_list=`for i in $$bases; do echo $$i.log; done`; \
++	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
++	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
++	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
++	exit $$?;
++cairo-test-suite.log: cairo-test-suite$(EXEEXT)
++	@p='cairo-test-suite$(EXEEXT)'; \
++	b='cairo-test-suite'; \
++	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
++	--log-file $$b.log --trs-file $$b.trs \
++	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
++	"$$tst" $(AM_TESTS_FD_REDIRECT)
++.test.log:
++	@p='$<'; \
++	$(am__set_b); \
++	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
++	--log-file $$b.log --trs-file $$b.trs \
++	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
++	"$$tst" $(AM_TESTS_FD_REDIRECT)
++@am__EXEEXT_TRUE@.test$(EXEEXT).log:
++@am__EXEEXT_TRUE@	@p='$<'; \
++@am__EXEEXT_TRUE@	$(am__set_b); \
++@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
++@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
++@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
++@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -8020,13 +8297,10 @@ distdir: $(DISTFILES)
+ 	done
+ 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+-	    || exit 1; \
+-	  fi; \
+-	done
+-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+-	  if test "$$subdir" = .; then :; else \
++	    $(am__make_dryrun) \
++	      || test -d "$(distdir)/$$subdir" \
++	      || $(MKDIR_P) "$(distdir)/$$subdir" \
++	      || exit 1; \
+ 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ 	    $(am__relativize); \
+ 	    new_distdir=$$reldir; \
+@@ -8075,6 +8349,9 @@ install-strip:
+ 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ 	fi
+ mostlyclean-generic:
++	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
++	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
++	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ 
+ clean-generic:
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -8160,25 +8437,23 @@ ps-am:
+ 
+ uninstall-am:
+ 
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+-	check-am ctags-recursive install install-am install-strip \
+-	tags-recursive
+-
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+-	all all-am check check-TESTS check-am clean \
+-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
+-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-dvi \
+-	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-info install-info-am install-man \
+-	install-pdf install-pdf-am install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am
++.MAKE: $(am__recursive_targets) all check check-am install install-am \
++	install-strip
++
++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
++	check-TESTS check-am clean clean-checkPROGRAMS clean-generic \
++	clean-libtool clean-local clean-noinstPROGRAMS cscopelist-am \
++	ctags ctags-am distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	recheck tags tags-am uninstall uninstall-am
+ 
+ 
+ cairo-test-constructors.c: Makefile $(test_sources) make-cairo-test-constructors.sh
+diff --git a/test/cairo-test-constructors.c b/test/cairo-test-constructors.c
+index a3f8a85..fff8044 100644
+--- a/test/cairo-test-constructors.c
++++ b/test/cairo-test-constructors.c
+@@ -512,9 +512,6 @@ extern void _register_xcomposite_projection (void);
+ extern void _register_xlib_expose_event (void);
+ extern void _register_zero_alpha (void);
+ extern void _register_zero_mask (void);
+-extern void _register_pthread_same_source (void);
+-extern void _register_pthread_show_text (void);
+-extern void _register_pthread_similar (void);
+ extern void _register_bitmap_font (void);
+ extern void _register_ft_font_create_for_ft_face (void);
+ extern void _register_ft_show_glyphs_positioning (void);
+@@ -531,10 +528,6 @@ extern void _register_ps_surface_source (void);
+ extern void _register_svg_surface (void);
+ extern void _register_svg_clip (void);
+ extern void _register_svg_surface_source (void);
+-extern void _register_xcb_surface_source (void);
+-extern void _register_xlib_surface (void);
+-extern void _register_xlib_surface_source (void);
+-extern void _register_get_xrender_format (void);
+ extern void _register_multi_page (void);
+ extern void _register_fallback_resolution (void);
+ 
+@@ -1049,9 +1042,6 @@ _cairo_test_runner_register_tests (void)
+     _register_xlib_expose_event ();
+     _register_zero_alpha ();
+     _register_zero_mask ();
+-    _register_pthread_same_source ();
+-    _register_pthread_show_text ();
+-    _register_pthread_similar ();
+     _register_bitmap_font ();
+     _register_ft_font_create_for_ft_face ();
+     _register_ft_show_glyphs_positioning ();
+@@ -1068,10 +1058,6 @@ _cairo_test_runner_register_tests (void)
+     _register_svg_surface ();
+     _register_svg_clip ();
+     _register_svg_surface_source ();
+-    _register_xcb_surface_source ();
+-    _register_xlib_surface ();
+-    _register_xlib_surface_source ();
+-    _register_get_xrender_format ();
+     _register_multi_page ();
+     _register_fallback_resolution ();
+ }
+diff --git a/test/pdiff/Makefile.in b/test/pdiff/Makefile.in
+index 1da0c24..1dcb2e2 100644
+--- a/test/pdiff/Makefile.in
++++ b/test/pdiff/Makefile.in
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.3 from Makefile.am.
++# Makefile.in generated by automake 1.13.1 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +15,23 @@
+ @SET_MAKE@
+ 
+ VPATH = @srcdir@
++am__make_dryrun = \
++  { \
++    am__dry=no; \
++    case $$MAKEFLAGS in \
++      *\\[\ \	]*) \
++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++      *) \
++        for am__flg in $$MAKEFLAGS; do \
++          case $$am__flg in \
++            *=*|--*) ;; \
++            *n*) am__dry=yes; break;; \
++          esac; \
++        done;; \
++    esac; \
++    test $$am__dry = yes; \
++  }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -34,8 +50,9 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/build/Makefile.am.common
++DIST_COMMON = $(top_srcdir)/build/Makefile.am.common \
++	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++	$(top_srcdir)/build/depcomp $(top_srcdir)/build/test-driver
+ EXTRA_PROGRAMS = perceptualdiff$(EXEEXT)
+ TESTS =
+ check_PROGRAMS =
+@@ -75,11 +92,24 @@ libpdiff_la_OBJECTS = $(am_libpdiff_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
++am__v_lt_1 = 
+ am_perceptualdiff_OBJECTS = args.$(OBJEXT) perceptualdiff.$(OBJEXT)
+ perceptualdiff_OBJECTS = $(am_perceptualdiff_OBJECTS)
+ perceptualdiff_LDADD = $(LDADD)
+ perceptualdiff_DEPENDENCIES = libpdiff.la \
+ 	$(top_builddir)/src/libcairo.la
++AM_V_P = $(am__v_P_@AM_V@)
++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_@AM_V@)
++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
++am__v_GEN_0 = @echo "  GEN     " $@;
++am__v_GEN_1 = 
++AM_V_at = $(am__v_at_@AM_V@)
++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build/depcomp
+ am__depfiles_maybe = depfiles
+@@ -92,26 +122,244 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+-am__v_CC_0 = @echo "  CC    " $@;
+-AM_V_at = $(am__v_at_@AM_V@)
+-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+-am__v_at_0 = @
++am__v_CC_0 = @echo "  CC      " $@;
++am__v_CC_1 = 
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+-am__v_CCLD_0 = @echo "  CCLD  " $@;
+-AM_V_GEN = $(am__v_GEN_@AM_V@)
+-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+-am__v_GEN_0 = @echo "  GEN   " $@;
++am__v_CCLD_0 = @echo "  CCLD    " $@;
++am__v_CCLD_1 = 
+ SOURCES = $(libpdiff_la_SOURCES) $(perceptualdiff_SOURCES)
+ DIST_SOURCES = $(libpdiff_la_SOURCES) $(perceptualdiff_SOURCES)
++am__can_run_installinfo = \
++  case $$AM_UPDATE_INFO_DIR in \
++    n|no|NO) false;; \
++    *) (install-info --version) >/dev/null 2>&1;; \
++  esac
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++# Read a list of newline-separated strings from the standard input,
++# and print each of them once, without duplicates.  Input order is
++# *not* preserved.
++am__uniquify_input = $(AWK) '\
++  BEGIN { nonempty = 0; } \
++  { items[$$0] = 1; nonempty = 1; } \
++  END { if (nonempty) { for (i in items) print i; }; } \
++'
++# Make sure the list of sources is unique.  This is necessary because,
++# e.g., the same source file might be shared among _SOURCES variables
++# for different programs/libraries.
++am__define_uniq_tagged_files = \
++  list='$(am__tagged_files)'; \
++  unique=`for i in $$list; do \
++    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++  done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-am__tty_colors = \
+-red=; grn=; lgn=; blu=; std=
++am__tty_colors_dummy = \
++  mgn= red= grn= lgn= blu= brg= std=; \
++  am__color_tests=no
++am__tty_colors = { \
++  $(am__tty_colors_dummy); \
++  if test "X$(AM_COLOR_TESTS)" = Xno; then \
++    am__color_tests=no; \
++  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
++    am__color_tests=yes; \
++  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
++    am__color_tests=yes; \
++  fi; \
++  if test $$am__color_tests = yes; then \
++    red=''; \
++    grn=''; \
++    lgn=''; \
++    blu=''; \
++    mgn=''; \
++    brg=''; \
++    std=''; \
++  fi; \
++}
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
++am__recheck_rx = ^[ 	]*:recheck:[ 	]*
++am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
++am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
++# A command that, given a newline-separated list of test names on the
++# standard input, print the name of the tests that are to be re-run
++# upon "make recheck".
++am__list_recheck_tests = $(AWK) '{ \
++  recheck = 1; \
++  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
++    { \
++      if (rc < 0) \
++        { \
++          if ((getline line2 < ($$0 ".log")) < 0) \
++	    recheck = 0; \
++          break; \
++        } \
++      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
++        { \
++          recheck = 0; \
++          break; \
++        } \
++      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
++        { \
++          break; \
++        } \
++    }; \
++  if (recheck) \
++    print $$0; \
++  close ($$0 ".trs"); \
++  close ($$0 ".log"); \
++}'
++# A command that, given a newline-separated list of test names on the
++# standard input, create the global log from their .trs and .log files.
++am__create_global_log = $(AWK) ' \
++function fatal(msg) \
++{ \
++  print "fatal: making $@: " msg | "cat >&2"; \
++  exit 1; \
++} \
++function rst_section(header) \
++{ \
++  print header; \
++  len = length(header); \
++  for (i = 1; i <= len; i = i + 1) \
++    printf "="; \
++  printf "\n\n"; \
++} \
++{ \
++  copy_in_global_log = 1; \
++  global_test_result = "RUN"; \
++  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
++    { \
++      if (rc < 0) \
++         fatal("failed to read from " $$0 ".trs"); \
++      if (line ~ /$(am__global_test_result_rx)/) \
++        { \
++          sub("$(am__global_test_result_rx)", "", line); \
++          sub("[ 	]*$$", "", line); \
++          global_test_result = line; \
++        } \
++      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
++        copy_in_global_log = 0; \
++    }; \
++  if (copy_in_global_log) \
++    { \
++      rst_section(global_test_result ": " $$0); \
++      while ((rc = (getline line < ($$0 ".log"))) != 0) \
++      { \
++        if (rc < 0) \
++          fatal("failed to read from " $$0 ".log"); \
++        print line; \
++      }; \
++      printf "\n"; \
++    }; \
++  close ($$0 ".trs"); \
++  close ($$0 ".log"); \
++}'
++# Restructured Text title.
++am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
++# Solaris 10 'make', and several other traditional 'make' implementations,
++# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
++# by disabling -e (using the XSI extension "set +e") if it's set.
++am__sh_e_setup = case $$- in *e*) set +e;; esac
++# Default flags passed to test drivers.
++am__common_driver_flags = \
++  --color-tests "$$am__color_tests" \
++  --enable-hard-errors "$$am__enable_hard_errors" \
++  --expect-failure "$$am__expect_failure"
++# To be inserted before the command running the test.  Creates the
++# directory for the log if needed.  Stores in $dir the directory
++# containing $f, in $tst the test, in $log the log.  Executes the
++# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
++# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
++# will run the test scripts (or their associated LOG_COMPILER, if
++# thy have one).
++am__check_pre = \
++$(am__sh_e_setup);					\
++$(am__vpath_adj_setup) $(am__vpath_adj)			\
++$(am__tty_colors);					\
++srcdir=$(srcdir); export srcdir;			\
++case "$@" in						\
++  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
++    *) am__odir=.;; 					\
++esac;							\
++test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
++  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
++if test -f "./$$f"; then dir=./;			\
++elif test -f "$$f"; then dir=;				\
++else dir="$(srcdir)/"; fi;				\
++tst=$$dir$$f; log='$@'; 				\
++if test -n '$(DISABLE_HARD_ERRORS)'; then		\
++  am__enable_hard_errors=no; 				\
++else							\
++  am__enable_hard_errors=yes; 				\
++fi; 							\
++case " $(XFAIL_TESTS) " in				\
++  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
++    am__expect_failure=yes;;				\
++  *)							\
++    am__expect_failure=no;;				\
++esac; 							\
++$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
++# A shell command to get the names of the tests scripts with any registered
++# extension removed (i.e., equivalently, the names of the test logs, with
++# the '.log' extension removed).  The result is saved in the shell variable
++# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
++# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
++# since that might cause problem with VPATH rewrites for suffix-less tests.
++# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
++am__set_TESTS_bases = \
++  bases='$(TEST_LOGS)'; \
++  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
++  bases=`echo $$bases`
++RECHECK_LOGS = $(TEST_LOGS)
++AM_RECURSIVE_TARGETS = check recheck
++TEST_SUITE_LOG = test-suite.log
++TEST_EXTENSIONS = @EXEEXT@ .test
++am__test_logs1 = $(TESTS:=.log)
++am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
++TEST_LOGS = $(am__test_logs2:.test.log=.log)
++TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
++TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
++	$(TEST_LOG_FLAGS)
++am__set_b = \
++  case '$@' in \
++    */*) \
++      case '$*' in \
++        */*) b='$*';; \
++          *) b=`echo '$@' | sed 's/\.log$$//'`; \
++       esac;; \
++    *) \
++      b='$*';; \
++  esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -353,7 +601,7 @@ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .c .lo .o .obj
++.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.am.common $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -388,12 +636,14 @@ $(am__aclocal_m4_deps):
+ 
+ clean-noinstLTLIBRARIES:
+ 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" != "$$p" || dir=.; \
+-	  echo "rm -f \"$${dir}/so_locations\""; \
+-	  rm -f "$${dir}/so_locations"; \
+-	done
++	@list='$(noinst_LTLIBRARIES)'; \
++	locs=`for p in $$list; do echo $$p; done | \
++	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
++	      sort -u`; \
++	test -z "$$locs" || { \
++	  echo rm -f $${locs}; \
++	  rm -f $${locs}; \
++	}
+ libpdiff.la: $(libpdiff_la_OBJECTS) $(libpdiff_la_DEPENDENCIES) $(EXTRA_libpdiff_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(LINK)  $(libpdiff_la_OBJECTS) $(libpdiff_la_LIBADD) $(LIBS)
+ 
+@@ -447,26 +697,15 @@ mostlyclean-libtool:
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	mkid -fID $$unique
+-tags: TAGS
+-
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
++ID: $(am__tagged_files)
++	$(am__define_uniq_tagged_files); mkid -fID $$unique
++tags: tags-am
++TAGS: tags
++
++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ 	set x; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++	$(am__define_uniq_tagged_files); \
+ 	shift; \
+ 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+@@ -478,15 +717,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 	      $$unique; \
+ 	  fi; \
+ 	fi
+-ctags: CTAGS
+-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++ctags: ctags-am
++
++CTAGS: ctags
++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++	$(am__define_uniq_tagged_files); \
+ 	test -z "$(CTAGS_ARGS)$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$unique
+@@ -495,102 +730,180 @@ GTAGS:
+ 	here=`$(am__cd) $(top_builddir) && pwd` \
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
++cscopelist: cscopelist-am
++
++cscopelist-am: $(am__tagged_files)
++	list='$(am__tagged_files)'; \
++	case "$(srcdir)" in \
++	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
++	  *) sdir=$(subdir)/$(srcdir) ;; \
++	esac; \
++	for i in $$list; do \
++	  if test -f "$$i"; then \
++	    echo "$(subdir)/$$i"; \
++	  else \
++	    echo "$$sdir/$$i"; \
++	  fi; \
++	done >> $(top_builddir)/cscope.files
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+-check-TESTS: $(TESTS)
+-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+-	srcdir=$(srcdir); export srcdir; \
+-	list=' $(TESTS) '; \
+-	$(am__tty_colors); \
+-	if test -n "$$list"; then \
+-	  for tst in $$list; do \
+-	    if test -f ./$$tst; then dir=./; \
+-	    elif test -f $$tst; then dir=; \
+-	    else dir="$(srcdir)/"; fi; \
+-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+-	      all=`expr $$all + 1`; \
+-	      case " $(XFAIL_TESTS) " in \
+-	      *[\ \	]$$tst[\ \	]*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		col=$$red; res=XPASS; \
+-	      ;; \
+-	      *) \
+-		col=$$grn; res=PASS; \
+-	      ;; \
+-	      esac; \
+-	    elif test $$? -ne 77; then \
+-	      all=`expr $$all + 1`; \
+-	      case " $(XFAIL_TESTS) " in \
+-	      *[\ \	]$$tst[\ \	]*) \
+-		xfail=`expr $$xfail + 1`; \
+-		col=$$lgn; res=XFAIL; \
+-	      ;; \
+-	      *) \
+-		failed=`expr $$failed + 1`; \
+-		col=$$red; res=FAIL; \
+-	      ;; \
+-	      esac; \
+-	    else \
+-	      skip=`expr $$skip + 1`; \
+-	      col=$$blu; res=SKIP; \
+-	    fi; \
+-	    echo "$${col}$$res$${std}: $$tst"; \
+-	  done; \
+-	  if test "$$all" -eq 1; then \
+-	    tests="test"; \
+-	    All=""; \
+-	  else \
+-	    tests="tests"; \
+-	    All="All "; \
++# Recover from deleted '.trs' file; this should ensure that
++# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
++# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
++# to avoid problems with "make -n".
++.log.trs:
++	rm -f $< $@
++	$(MAKE) $(AM_MAKEFLAGS) $<
++
++# Leading 'am--fnord' is there to ensure the list of targets does not
++# exand to empty, as could happen e.g. with make check TESTS=''.
++am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
++am--force-recheck:
++	@:
++
++$(TEST_SUITE_LOG): $(TEST_LOGS)
++	@$(am__set_TESTS_bases); \
++	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
++	redo_bases=`for i in $$bases; do \
++	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
++	            done`; \
++	if test -n "$$redo_bases"; then \
++	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
++	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
++	  if $(am__make_dryrun); then :; else \
++	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+ 	  fi; \
+-	  if test "$$failed" -eq 0; then \
+-	    if test "$$xfail" -eq 0; then \
+-	      banner="$$All$$all $$tests passed"; \
+-	    else \
+-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+-	    fi; \
+-	  else \
+-	    if test "$$xpass" -eq 0; then \
+-	      banner="$$failed of $$all $$tests failed"; \
++	fi; \
++	if test -n "$$am__remaking_logs"; then \
++	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
++	       "recursion detected" >&2; \
++	else \
++	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
++	fi; \
++	if $(am__make_dryrun); then :; else \
++	  st=0;  \
++	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
++	  for i in $$redo_bases; do \
++	    test -f $$i.trs && test -r $$i.trs \
++	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
++	    test -f $$i.log && test -r $$i.log \
++	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
++	  done; \
++	  test $$st -eq 0 || exit 1; \
++	fi
++	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
++	ws='[ 	]'; \
++	results=`for b in $$bases; do echo $$b.trs; done`; \
++	test -n "$$results" || results=/dev/null; \
++	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
++	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
++	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
++	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
++	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
++	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
++	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
++	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
++	  success=true; \
++	else \
++	  success=false; \
++	fi; \
++	br='==================='; br=$$br$$br$$br$$br; \
++	result_count () \
++	{ \
++	    if test x"$$1" = x"--maybe-color"; then \
++	      maybe_colorize=yes; \
++	    elif test x"$$1" = x"--no-color"; then \
++	      maybe_colorize=no; \
+ 	    else \
+-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+ 	    fi; \
+-	  fi; \
+-	  dashes="$$banner"; \
+-	  skipped=""; \
+-	  if test "$$skip" -ne 0; then \
+-	    if test "$$skip" -eq 1; then \
+-	      skipped="($$skip test was not run)"; \
++	    shift; \
++	    desc=$$1 count=$$2; \
++	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
++	      color_start=$$3 color_end=$$std; \
+ 	    else \
+-	      skipped="($$skip tests were not run)"; \
++	      color_start= color_end=; \
+ 	    fi; \
+-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+-	      dashes="$$skipped"; \
+-	  fi; \
+-	  report=""; \
+-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+-	      dashes="$$report"; \
+-	  fi; \
+-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+-	  if test "$$failed" -eq 0; then \
+-	    col="$$grn"; \
+-	  else \
+-	    col="$$red"; \
+-	  fi; \
+-	  echo "$${col}$$dashes$${std}"; \
+-	  echo "$${col}$$banner$${std}"; \
+-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+-	  echo "$${col}$$dashes$${std}"; \
+-	  test "$$failed" -eq 0; \
+-	else :; fi
++	    echo "$${color_start}# $$desc $$count$${color_end}"; \
++	}; \
++	create_testsuite_report () \
++	{ \
++	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
++	  result_count $$1 "PASS: " $$pass  "$$grn"; \
++	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
++	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
++	  result_count $$1 "FAIL: " $$fail  "$$red"; \
++	  result_count $$1 "XPASS:" $$xpass "$$red"; \
++	  result_count $$1 "ERROR:" $$error "$$mgn"; \
++	}; \
++	{								\
++	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
++	    $(am__rst_title);						\
++	  create_testsuite_report --no-color;				\
++	  echo;								\
++	  echo ".. contents:: :depth: 2";				\
++	  echo;								\
++	  for b in $$bases; do echo $$b; done				\
++	    | $(am__create_global_log);					\
++	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
++	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
++	if $$success; then						\
++	  col="$$grn";							\
++	 else								\
++	  col="$$red";							\
++	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
++	fi;								\
++	echo "$${col}$$br$${std}"; 					\
++	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
++	echo "$${col}$$br$${std}"; 					\
++	create_testsuite_report --maybe-color;				\
++	echo "$$col$$br$$std";						\
++	if $$success; then :; else					\
++	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
++	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
++	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
++	  fi;								\
++	  echo "$$col$$br$$std";					\
++	fi;								\
++	$$success || exit 1
++
++check-TESTS:
++	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
++	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
++	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
++	@set +e; $(am__set_TESTS_bases); \
++	log_list=`for i in $$bases; do echo $$i.log; done`; \
++	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
++	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
++	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
++	exit $$?;
++recheck: all $(check_PROGRAMS)
++	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
++	@set +e; $(am__set_TESTS_bases); \
++	bases=`for i in $$bases; do echo $$i; done \
++	         | $(am__list_recheck_tests)` || exit 1; \
++	log_list=`for i in $$bases; do echo $$i.log; done`; \
++	log_list=`echo $$log_list`; \
++	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
++	        am__force_recheck=am--force-recheck \
++	        TEST_LOGS="$$log_list"; \
++	exit $$?
++.test.log:
++	@p='$<'; \
++	$(am__set_b); \
++	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
++	--log-file $$b.log --trs-file $$b.trs \
++	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
++	"$$tst" $(AM_TESTS_FD_REDIRECT)
++@am__EXEEXT_TRUE@.test$(EXEEXT).log:
++@am__EXEEXT_TRUE@	@p='$<'; \
++@am__EXEEXT_TRUE@	$(am__set_b); \
++@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
++@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
++@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
++@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -650,6 +963,9 @@ install-strip:
+ 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ 	fi
+ mostlyclean-generic:
++	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
++	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
++	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ 
+ clean-generic:
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -737,19 +1053,20 @@ uninstall-am:
+ 
+ .MAKE: all check check-am install install-am install-strip
+ 
+-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
++.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool \
+-	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+-	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-dvi install-dvi-am \
+-	install-exec install-exec-am install-html install-html-am \
+-	install-info install-info-am install-man install-pdf \
+-	install-pdf-am install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am
++	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
++	uninstall-am
+ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+-- 
+1.8.3.4
+