Import upstream version 1.9.12

author: Sebastian Dröge <sebastian.droege@collabora.co.uk> 2010-07-12 14:58:31 +0200
committer: Sebastian Dröge <sebastian.droege@collabora.co.uk> 2010-07-12 14:58:31 +0200
commit: dd132f63446980996966ab87a4eb34e4026a8895 (patch)
tree: ce8b0a90188c8779bbf38e7ee2a2f800cb19585c /util
parent: 342796e34d0c9374c51f2ab70a85c5a9f6b97700 (diff)
10 files changed, 417 insertions, 339 deletions
diff --git a/util/Makefile.in b/util/Makefile.in
index 57af662..6eb0457 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -51,14 +51,11 @@ subdir = util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -72,6 +69,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -82,6 +80,9 @@ CONFIG_CLEAN_VPATH_FILES =
 backtrace_symbols_la_DEPENDENCIES =
 backtrace_symbols_la_SOURCES = backtrace-symbols.c
 backtrace_symbols_la_OBJECTS = backtrace-symbols.lo
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 malloc_stats_la_LIBADD =
 malloc_stats_la_SOURCES = malloc-stats.c
 malloc_stats_la_OBJECTS = malloc-stats.lo
@@ -93,25 +94,25 @@ font_view_OBJECTS = font_view-font-view.$(OBJEXT)
 am__DEPENDENCIES_1 =
 @HAVE_GTK_TRUE@font_view_DEPENDENCIES = ../src/libcairo.la \
 @HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
-font_view_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+font_view_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(font_view_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_show_edges_OBJECTS = show_edges-show-edges.$(OBJEXT)
 show_edges_OBJECTS = $(am_show_edges_OBJECTS)
 show_edges_DEPENDENCIES = $(am__DEPENDENCIES_1)
-show_edges_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+show_edges_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(show_edges_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_show_events_OBJECTS = show_events-show-events.$(OBJEXT)
 show_events_OBJECTS = $(am_show_events_OBJECTS)
 show_events_DEPENDENCIES = $(am__DEPENDENCIES_1)
-show_events_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+show_events_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(show_events_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_show_traps_OBJECTS = show_traps-show-traps.$(OBJEXT)
 show_traps_OBJECTS = $(am_show_traps_OBJECTS)
 show_traps_DEPENDENCIES = $(am__DEPENDENCIES_1)
-show_traps_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+show_traps_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(show_traps_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 trace_to_xml_SOURCES = trace-to-xml.c
@@ -128,10 +129,26 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = backtrace-symbols.c malloc-stats.c font-view.c \
 	$(show_edges_SOURCES) $(show_events_SOURCES) \
 	$(show_traps_SOURCES) trace-to-xml.c xml-to-trace.c
@@ -183,7 +200,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -220,7 +237,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -228,8 +244,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -258,17 +272,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -285,10 +295,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -297,7 +303,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -319,7 +324,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -374,11 +378,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
@@ -470,9 +477,9 @@ $(ACLOCAL_M4):  $(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) 
-	$(LINK)  $(backtrace_symbols_la_OBJECTS) $(backtrace_symbols_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK)  $(backtrace_symbols_la_OBJECTS) $(backtrace_symbols_la_LIBADD) $(LIBS)
 malloc-stats.la: $(malloc_stats_la_OBJECTS) $(malloc_stats_la_DEPENDENCIES) 
-	$(LINK)  $(malloc_stats_la_OBJECTS) $(malloc_stats_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK)  $(malloc_stats_la_OBJECTS) $(malloc_stats_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -484,22 +491,22 @@ clean-checkPROGRAMS:
 	rm -f $$list
 font-view$(EXEEXT): $(font_view_OBJECTS) $(font_view_DEPENDENCIES) 
 	@rm -f font-view$(EXEEXT)
-	$(font_view_LINK) $(font_view_OBJECTS) $(font_view_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(font_view_LINK) $(font_view_OBJECTS) $(font_view_LDADD) $(LIBS)
 show-edges$(EXEEXT): $(show_edges_OBJECTS) $(show_edges_DEPENDENCIES) 
 	@rm -f show-edges$(EXEEXT)
-	$(show_edges_LINK) $(show_edges_OBJECTS) $(show_edges_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(show_edges_LINK) $(show_edges_OBJECTS) $(show_edges_LDADD) $(LIBS)
 show-events$(EXEEXT): $(show_events_OBJECTS) $(show_events_DEPENDENCIES) 
 	@rm -f show-events$(EXEEXT)
-	$(show_events_LINK) $(show_events_OBJECTS) $(show_events_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(show_events_LINK) $(show_events_OBJECTS) $(show_events_LDADD) $(LIBS)
 show-traps$(EXEEXT): $(show_traps_OBJECTS) $(show_traps_DEPENDENCIES) 
 	@rm -f show-traps$(EXEEXT)
-	$(show_traps_LINK) $(show_traps_OBJECTS) $(show_traps_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(show_traps_LINK) $(show_traps_OBJECTS) $(show_traps_LDADD) $(LIBS)
 trace-to-xml$(EXEEXT): $(trace_to_xml_OBJECTS) $(trace_to_xml_DEPENDENCIES) 
 	@rm -f trace-to-xml$(EXEEXT)
-	$(LINK) $(trace_to_xml_OBJECTS) $(trace_to_xml_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(trace_to_xml_OBJECTS) $(trace_to_xml_LDADD) $(LIBS)
 xml-to-trace$(EXEEXT): $(xml_to_trace_OBJECTS) $(xml_to_trace_DEPENDENCIES) 
 	@rm -f xml-to-trace$(EXEEXT)
-	$(LINK) $(xml_to_trace_OBJECTS) $(xml_to_trace_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(xml_to_trace_OBJECTS) $(xml_to_trace_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -517,78 +524,89 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml-to-trace.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 font_view-font-view.o: font-view.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -MT font_view-font-view.o -MD -MP -MF $(DEPDIR)/font_view-font-view.Tpo -c -o font_view-font-view.o `test -f 'font-view.c' || echo '$(srcdir)/'`font-view.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/font_view-font-view.Tpo $(DEPDIR)/font_view-font-view.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -MT font_view-font-view.o -MD -MP -MF $(DEPDIR)/font_view-font-view.Tpo -c -o font_view-font-view.o `test -f 'font-view.c' || echo '$(srcdir)/'`font-view.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/font_view-font-view.Tpo $(DEPDIR)/font_view-font-view.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='font-view.c' object='font_view-font-view.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -c -o font_view-font-view.o `test -f 'font-view.c' || echo '$(srcdir)/'`font-view.c
 
 font_view-font-view.obj: font-view.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -MT font_view-font-view.obj -MD -MP -MF $(DEPDIR)/font_view-font-view.Tpo -c -o font_view-font-view.obj `if test -f 'font-view.c'; then $(CYGPATH_W) 'font-view.c'; else $(CYGPATH_W) '$(srcdir)/font-view.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/font_view-font-view.Tpo $(DEPDIR)/font_view-font-view.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -MT font_view-font-view.obj -MD -MP -MF $(DEPDIR)/font_view-font-view.Tpo -c -o font_view-font-view.obj `if test -f 'font-view.c'; then $(CYGPATH_W) 'font-view.c'; else $(CYGPATH_W) '$(srcdir)/font-view.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/font_view-font-view.Tpo $(DEPDIR)/font_view-font-view.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='font-view.c' object='font_view-font-view.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(font_view_CFLAGS) $(CFLAGS) -c -o font_view-font-view.obj `if test -f 'font-view.c'; then $(CYGPATH_W) 'font-view.c'; else $(CYGPATH_W) '$(srcdir)/font-view.c'; fi`
 
 show_edges-show-edges.o: show-edges.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -MT show_edges-show-edges.o -MD -MP -MF $(DEPDIR)/show_edges-show-edges.Tpo -c -o show_edges-show-edges.o `test -f 'show-edges.c' || echo '$(srcdir)/'`show-edges.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_edges-show-edges.Tpo $(DEPDIR)/show_edges-show-edges.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -MT show_edges-show-edges.o -MD -MP -MF $(DEPDIR)/show_edges-show-edges.Tpo -c -o show_edges-show-edges.o `test -f 'show-edges.c' || echo '$(srcdir)/'`show-edges.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_edges-show-edges.Tpo $(DEPDIR)/show_edges-show-edges.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-edges.c' object='show_edges-show-edges.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -c -o show_edges-show-edges.o `test -f 'show-edges.c' || echo '$(srcdir)/'`show-edges.c
 
 show_edges-show-edges.obj: show-edges.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -MT show_edges-show-edges.obj -MD -MP -MF $(DEPDIR)/show_edges-show-edges.Tpo -c -o show_edges-show-edges.obj `if test -f 'show-edges.c'; then $(CYGPATH_W) 'show-edges.c'; else $(CYGPATH_W) '$(srcdir)/show-edges.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_edges-show-edges.Tpo $(DEPDIR)/show_edges-show-edges.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -MT show_edges-show-edges.obj -MD -MP -MF $(DEPDIR)/show_edges-show-edges.Tpo -c -o show_edges-show-edges.obj `if test -f 'show-edges.c'; then $(CYGPATH_W) 'show-edges.c'; else $(CYGPATH_W) '$(srcdir)/show-edges.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_edges-show-edges.Tpo $(DEPDIR)/show_edges-show-edges.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-edges.c' object='show_edges-show-edges.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_edges_CFLAGS) $(CFLAGS) -c -o show_edges-show-edges.obj `if test -f 'show-edges.c'; then $(CYGPATH_W) 'show-edges.c'; else $(CYGPATH_W) '$(srcdir)/show-edges.c'; fi`
 
 show_events-show-events.o: show-events.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -MT show_events-show-events.o -MD -MP -MF $(DEPDIR)/show_events-show-events.Tpo -c -o show_events-show-events.o `test -f 'show-events.c' || echo '$(srcdir)/'`show-events.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_events-show-events.Tpo $(DEPDIR)/show_events-show-events.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -MT show_events-show-events.o -MD -MP -MF $(DEPDIR)/show_events-show-events.Tpo -c -o show_events-show-events.o `test -f 'show-events.c' || echo '$(srcdir)/'`show-events.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_events-show-events.Tpo $(DEPDIR)/show_events-show-events.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-events.c' object='show_events-show-events.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -c -o show_events-show-events.o `test -f 'show-events.c' || echo '$(srcdir)/'`show-events.c
 
 show_events-show-events.obj: show-events.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -MT show_events-show-events.obj -MD -MP -MF $(DEPDIR)/show_events-show-events.Tpo -c -o show_events-show-events.obj `if test -f 'show-events.c'; then $(CYGPATH_W) 'show-events.c'; else $(CYGPATH_W) '$(srcdir)/show-events.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_events-show-events.Tpo $(DEPDIR)/show_events-show-events.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -MT show_events-show-events.obj -MD -MP -MF $(DEPDIR)/show_events-show-events.Tpo -c -o show_events-show-events.obj `if test -f 'show-events.c'; then $(CYGPATH_W) 'show-events.c'; else $(CYGPATH_W) '$(srcdir)/show-events.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_events-show-events.Tpo $(DEPDIR)/show_events-show-events.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-events.c' object='show_events-show-events.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_events_CFLAGS) $(CFLAGS) -c -o show_events-show-events.obj `if test -f 'show-events.c'; then $(CYGPATH_W) 'show-events.c'; else $(CYGPATH_W) '$(srcdir)/show-events.c'; fi`
 
 show_traps-show-traps.o: show-traps.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -MT show_traps-show-traps.o -MD -MP -MF $(DEPDIR)/show_traps-show-traps.Tpo -c -o show_traps-show-traps.o `test -f 'show-traps.c' || echo '$(srcdir)/'`show-traps.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_traps-show-traps.Tpo $(DEPDIR)/show_traps-show-traps.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -MT show_traps-show-traps.o -MD -MP -MF $(DEPDIR)/show_traps-show-traps.Tpo -c -o show_traps-show-traps.o `test -f 'show-traps.c' || echo '$(srcdir)/'`show-traps.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_traps-show-traps.Tpo $(DEPDIR)/show_traps-show-traps.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-traps.c' object='show_traps-show-traps.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -c -o show_traps-show-traps.o `test -f 'show-traps.c' || echo '$(srcdir)/'`show-traps.c
 
 show_traps-show-traps.obj: show-traps.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -MT show_traps-show-traps.obj -MD -MP -MF $(DEPDIR)/show_traps-show-traps.Tpo -c -o show_traps-show-traps.obj `if test -f 'show-traps.c'; then $(CYGPATH_W) 'show-traps.c'; else $(CYGPATH_W) '$(srcdir)/show-traps.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/show_traps-show-traps.Tpo $(DEPDIR)/show_traps-show-traps.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -MT show_traps-show-traps.obj -MD -MP -MF $(DEPDIR)/show_traps-show-traps.Tpo -c -o show_traps-show-traps.obj `if test -f 'show-traps.c'; then $(CYGPATH_W) 'show-traps.c'; else $(CYGPATH_W) '$(srcdir)/show-traps.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/show_traps-show-traps.Tpo $(DEPDIR)/show_traps-show-traps.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='show-traps.c' object='show_traps-show-traps.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(show_traps_CFLAGS) $(CFLAGS) -c -o show_traps-show-traps.obj `if test -f 'show-traps.c'; then $(CYGPATH_W) 'show-traps.c'; else $(CYGPATH_W) '$(srcdir)/show-traps.c'; fi`
diff --git a/util/cairo-fdr/Makefile.in b/util/cairo-fdr/Makefile.in
index aa7c916..314a5f6 100644
--- a/util/cairo-fdr/Makefile.in
+++ b/util/cairo-fdr/Makefile.in
@@ -39,14 +39,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -60,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -93,7 +91,10 @@ LTLIBRARIES = $(cairolib_LTLIBRARIES)
 cairo_fdr_la_DEPENDENCIES =
 am_cairo_fdr_la_OBJECTS = cairo_fdr_la-fdr.lo
 cairo_fdr_la_OBJECTS = $(am_cairo_fdr_la_OBJECTS)
-cairo_fdr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+cairo_fdr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(cairo_fdr_la_CFLAGS) \
 	$(CFLAGS) $(cairo_fdr_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -102,10 +103,26 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(cairo_fdr_la_SOURCES)
 DIST_SOURCES = $(cairo_fdr_la_SOURCES)
 ETAGS = etags
@@ -113,7 +130,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -150,7 +167,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -158,8 +174,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -188,17 +202,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -215,10 +225,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -227,7 +233,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -249,7 +254,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -304,11 +308,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
@@ -407,7 +414,7 @@ clean-cairolibLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 cairo-fdr.la: $(cairo_fdr_la_OBJECTS) $(cairo_fdr_la_DEPENDENCIES) 
-	$(cairo_fdr_la_LINK) -rpath $(cairolibdir) $(cairo_fdr_la_OBJECTS) $(cairo_fdr_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(cairo_fdr_la_LINK) -rpath $(cairolibdir) $(cairo_fdr_la_OBJECTS) $(cairo_fdr_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -418,32 +425,36 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_fdr_la-fdr.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 cairo_fdr_la-fdr.lo: fdr.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_fdr_la_CPPFLAGS) $(CPPFLAGS) $(cairo_fdr_la_CFLAGS) $(CFLAGS) -MT cairo_fdr_la-fdr.lo -MD -MP -MF $(DEPDIR)/cairo_fdr_la-fdr.Tpo -c -o cairo_fdr_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cairo_fdr_la-fdr.Tpo $(DEPDIR)/cairo_fdr_la-fdr.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_fdr_la_CPPFLAGS) $(CPPFLAGS) $(cairo_fdr_la_CFLAGS) $(CFLAGS) -MT cairo_fdr_la-fdr.lo -MD -MP -MF $(DEPDIR)/cairo_fdr_la-fdr.Tpo -c -o cairo_fdr_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo_fdr_la-fdr.Tpo $(DEPDIR)/cairo_fdr_la-fdr.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fdr.c' object='cairo_fdr_la-fdr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_fdr_la_CPPFLAGS) $(CPPFLAGS) $(cairo_fdr_la_CFLAGS) $(CFLAGS) -c -o cairo_fdr_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_fdr_la_CPPFLAGS) $(CPPFLAGS) $(cairo_fdr_la_CFLAGS) $(CFLAGS) -c -o cairo_fdr_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/util/cairo-script/Makefile.in b/util/cairo-script/Makefile.in
index 175d085..e5679b8 100644
--- a/util/cairo-script/Makefile.in
+++ b/util/cairo-script/Makefile.in
@@ -44,14 +44,11 @@ DIST_COMMON = $(cairoinclude_HEADERS) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -65,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -108,7 +106,10 @@ am_libcairo_script_interpreter_la_OBJECTS =  \
 	libcairo_script_interpreter_la-cairo-script-stack.lo
 libcairo_script_interpreter_la_OBJECTS =  \
 	$(am_libcairo_script_interpreter_la_OBJECTS)
-libcairo_script_interpreter_la_LINK = $(LIBTOOL) --tag=CC \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libcairo_script_interpreter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) \
 	$(libcairo_script_interpreter_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -124,7 +125,7 @@ am_csi_replay_OBJECTS = csi_replay-csi-replay.$(OBJEXT)
 csi_replay_OBJECTS = $(am_csi_replay_OBJECTS)
 csi_replay_DEPENDENCIES = libcairo-script-interpreter.la \
 	$(top_builddir)/src/libcairo.la $(am__DEPENDENCIES_1)
-csi_replay_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+csi_replay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(csi_replay_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am__csi_trace_SOURCES_DIST = csi-trace.c
@@ -141,10 +142,26 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcairo_script_interpreter_la_SOURCES) csi-bind.c \
 	$(csi_exec_SOURCES) $(csi_replay_SOURCES) $(csi_trace_SOURCES)
 DIST_SOURCES = $(libcairo_script_interpreter_la_SOURCES) csi-bind.c \
@@ -194,7 +211,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -231,7 +248,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -239,8 +255,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -269,17 +283,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -296,10 +306,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -308,7 +314,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -330,7 +335,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -385,11 +389,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
@@ -505,19 +512,19 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcairo-script-interpreter.la: $(libcairo_script_interpreter_la_OBJECTS) $(libcairo_script_interpreter_la_DEPENDENCIES) 
-	$(libcairo_script_interpreter_la_LINK) -rpath $(libdir) $(libcairo_script_interpreter_la_OBJECTS) $(libcairo_script_interpreter_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libcairo_script_interpreter_la_LINK) -rpath $(libdir) $(libcairo_script_interpreter_la_OBJECTS) $(libcairo_script_interpreter_la_LIBADD) $(LIBS)
 csi-bind$(EXEEXT): $(csi_bind_OBJECTS) $(csi_bind_DEPENDENCIES) 
 	@rm -f csi-bind$(EXEEXT)
-	$(LINK) $(csi_bind_OBJECTS) $(csi_bind_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(csi_bind_OBJECTS) $(csi_bind_LDADD) $(LIBS)
 csi-exec$(EXEEXT): $(csi_exec_OBJECTS) $(csi_exec_DEPENDENCIES) 
 	@rm -f csi-exec$(EXEEXT)
-	$(LINK) $(csi_exec_OBJECTS) $(csi_exec_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(csi_exec_OBJECTS) $(csi_exec_LDADD) $(LIBS)
 csi-replay$(EXEEXT): $(csi_replay_OBJECTS) $(csi_replay_DEPENDENCIES) 
 	@rm -f csi-replay$(EXEEXT)
-	$(csi_replay_LINK) $(csi_replay_OBJECTS) $(csi_replay_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(csi_replay_LINK) $(csi_replay_OBJECTS) $(csi_replay_LDADD) $(LIBS)
 csi-trace$(EXEEXT): $(csi_trace_OBJECTS) $(csi_trace_DEPENDENCIES) 
 	@rm -f csi-trace$(EXEEXT)
-	$(LINK) $(csi_trace_OBJECTS) $(csi_trace_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(csi_trace_OBJECTS) $(csi_trace_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -538,85 +545,97 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libcairo_script_interpreter_la-cairo-script-file.lo: cairo-script-file.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-file.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Tpo -c -o libcairo_script_interpreter_la-cairo-script-file.lo `test -f 'cairo-script-file.c' || echo '$(srcdir)/'`cairo-script-file.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-file.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Tpo -c -o libcairo_script_interpreter_la-cairo-script-file.lo `test -f 'cairo-script-file.c' || echo '$(srcdir)/'`cairo-script-file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-file.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-file.c' object='libcairo_script_interpreter_la-cairo-script-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-file.lo `test -f 'cairo-script-file.c' || echo '$(srcdir)/'`cairo-script-file.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-file.lo `test -f 'cairo-script-file.c' || echo '$(srcdir)/'`cairo-script-file.c
 
 libcairo_script_interpreter_la-cairo-script-hash.lo: cairo-script-hash.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-hash.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Tpo -c -o libcairo_script_interpreter_la-cairo-script-hash.lo `test -f 'cairo-script-hash.c' || echo '$(srcdir)/'`cairo-script-hash.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-hash.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Tpo -c -o libcairo_script_interpreter_la-cairo-script-hash.lo `test -f 'cairo-script-hash.c' || echo '$(srcdir)/'`cairo-script-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-hash.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-hash.c' object='libcairo_script_interpreter_la-cairo-script-hash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-hash.lo `test -f 'cairo-script-hash.c' || echo '$(srcdir)/'`cairo-script-hash.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-hash.lo `test -f 'cairo-script-hash.c' || echo '$(srcdir)/'`cairo-script-hash.c
 
 libcairo_script_interpreter_la-cairo-script-interpreter.lo: cairo-script-interpreter.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-interpreter.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Tpo -c -o libcairo_script_interpreter_la-cairo-script-interpreter.lo `test -f 'cairo-script-interpreter.c' || echo '$(srcdir)/'`cairo-script-interpreter.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-interpreter.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Tpo -c -o libcairo_script_interpreter_la-cairo-script-interpreter.lo `test -f 'cairo-script-interpreter.c' || echo '$(srcdir)/'`cairo-script-interpreter.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-interpreter.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-interpreter.c' object='libcairo_script_interpreter_la-cairo-script-interpreter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-interpreter.lo `test -f 'cairo-script-interpreter.c' || echo '$(srcdir)/'`cairo-script-interpreter.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-interpreter.lo `test -f 'cairo-script-interpreter.c' || echo '$(srcdir)/'`cairo-script-interpreter.c
 
 libcairo_script_interpreter_la-cairo-script-objects.lo: cairo-script-objects.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-objects.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Tpo -c -o libcairo_script_interpreter_la-cairo-script-objects.lo `test -f 'cairo-script-objects.c' || echo '$(srcdir)/'`cairo-script-objects.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-objects.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Tpo -c -o libcairo_script_interpreter_la-cairo-script-objects.lo `test -f 'cairo-script-objects.c' || echo '$(srcdir)/'`cairo-script-objects.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-objects.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-objects.c' object='libcairo_script_interpreter_la-cairo-script-objects.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-objects.lo `test -f 'cairo-script-objects.c' || echo '$(srcdir)/'`cairo-script-objects.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-objects.lo `test -f 'cairo-script-objects.c' || echo '$(srcdir)/'`cairo-script-objects.c
 
 libcairo_script_interpreter_la-cairo-script-operators.lo: cairo-script-operators.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-operators.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Tpo -c -o libcairo_script_interpreter_la-cairo-script-operators.lo `test -f 'cairo-script-operators.c' || echo '$(srcdir)/'`cairo-script-operators.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-operators.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Tpo -c -o libcairo_script_interpreter_la-cairo-script-operators.lo `test -f 'cairo-script-operators.c' || echo '$(srcdir)/'`cairo-script-operators.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-operators.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-operators.c' object='libcairo_script_interpreter_la-cairo-script-operators.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-operators.lo `test -f 'cairo-script-operators.c' || echo '$(srcdir)/'`cairo-script-operators.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-operators.lo `test -f 'cairo-script-operators.c' || echo '$(srcdir)/'`cairo-script-operators.c
 
 libcairo_script_interpreter_la-cairo-script-scanner.lo: cairo-script-scanner.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-scanner.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Tpo -c -o libcairo_script_interpreter_la-cairo-script-scanner.lo `test -f 'cairo-script-scanner.c' || echo '$(srcdir)/'`cairo-script-scanner.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-scanner.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Tpo -c -o libcairo_script_interpreter_la-cairo-script-scanner.lo `test -f 'cairo-script-scanner.c' || echo '$(srcdir)/'`cairo-script-scanner.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-scanner.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-scanner.c' object='libcairo_script_interpreter_la-cairo-script-scanner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-scanner.lo `test -f 'cairo-script-scanner.c' || echo '$(srcdir)/'`cairo-script-scanner.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-scanner.lo `test -f 'cairo-script-scanner.c' || echo '$(srcdir)/'`cairo-script-scanner.c
 
 libcairo_script_interpreter_la-cairo-script-stack.lo: cairo-script-stack.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-stack.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Tpo -c -o libcairo_script_interpreter_la-cairo-script-stack.lo `test -f 'cairo-script-stack.c' || echo '$(srcdir)/'`cairo-script-stack.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Plo
+@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) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -MT libcairo_script_interpreter_la-cairo-script-stack.lo -MD -MP -MF $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Tpo -c -o libcairo_script_interpreter_la-cairo-script-stack.lo `test -f 'cairo-script-stack.c' || echo '$(srcdir)/'`cairo-script-stack.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Tpo $(DEPDIR)/libcairo_script_interpreter_la-cairo-script-stack.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cairo-script-stack.c' object='libcairo_script_interpreter_la-cairo-script-stack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-stack.lo `test -f 'cairo-script-stack.c' || echo '$(srcdir)/'`cairo-script-stack.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_script_interpreter_la_CFLAGS) $(CFLAGS) -c -o libcairo_script_interpreter_la-cairo-script-stack.lo `test -f 'cairo-script-stack.c' || echo '$(srcdir)/'`cairo-script-stack.c
 
 csi_replay-csi-replay.o: csi-replay.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -MT csi_replay-csi-replay.o -MD -MP -MF $(DEPDIR)/csi_replay-csi-replay.Tpo -c -o csi_replay-csi-replay.o `test -f 'csi-replay.c' || echo '$(srcdir)/'`csi-replay.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/csi_replay-csi-replay.Tpo $(DEPDIR)/csi_replay-csi-replay.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -MT csi_replay-csi-replay.o -MD -MP -MF $(DEPDIR)/csi_replay-csi-replay.Tpo -c -o csi_replay-csi-replay.o `test -f 'csi-replay.c' || echo '$(srcdir)/'`csi-replay.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/csi_replay-csi-replay.Tpo $(DEPDIR)/csi_replay-csi-replay.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='csi-replay.c' object='csi_replay-csi-replay.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -c -o csi_replay-csi-replay.o `test -f 'csi-replay.c' || echo '$(srcdir)/'`csi-replay.c
 
 csi_replay-csi-replay.obj: csi-replay.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -MT csi_replay-csi-replay.obj -MD -MP -MF $(DEPDIR)/csi_replay-csi-replay.Tpo -c -o csi_replay-csi-replay.obj `if test -f 'csi-replay.c'; then $(CYGPATH_W) 'csi-replay.c'; else $(CYGPATH_W) '$(srcdir)/csi-replay.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/csi_replay-csi-replay.Tpo $(DEPDIR)/csi_replay-csi-replay.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -MT csi_replay-csi-replay.obj -MD -MP -MF $(DEPDIR)/csi_replay-csi-replay.Tpo -c -o csi_replay-csi-replay.obj `if test -f 'csi-replay.c'; then $(CYGPATH_W) 'csi-replay.c'; else $(CYGPATH_W) '$(srcdir)/csi-replay.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/csi_replay-csi-replay.Tpo $(DEPDIR)/csi_replay-csi-replay.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='csi-replay.c' object='csi_replay-csi-replay.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csi_replay_CFLAGS) $(CFLAGS) -c -o csi_replay-csi-replay.obj `if test -f 'csi-replay.c'; then $(CYGPATH_W) 'csi-replay.c'; else $(CYGPATH_W) '$(srcdir)/csi-replay.c'; fi`
diff --git a/util/cairo-script/examples/Makefile.in b/util/cairo-script/examples/Makefile.in
index e71111d..491dbc3 100644
--- a/util/cairo-script/examples/Makefile.in
+++ b/util/cairo-script/examples/Makefile.in
@@ -38,14 +38,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -59,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -66,12 +64,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -108,7 +112,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -116,8 +119,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -146,17 +147,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -173,10 +170,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -185,7 +178,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -207,7 +199,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -262,11 +253,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am
index 85368df..b25bd23 100644
--- a/util/cairo-sphinx/Makefile.am
+++ b/util/cairo-sphinx/Makefile.am
@@ -16,8 +16,9 @@ cairo_sphinx_la_LIBADD = -ldl
 
 cairo_sphinx_SOURCES = sphinx.c
 cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
-cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(glib_CFLAGS)
+cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)  $(glib_CFLAGS)
 cairo_sphinx_LDADD = \
+	$(real_pthread_LIBS)					\
         $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
 	$(top_builddir)/src/libcairo.la 			\
diff --git a/util/cairo-sphinx/Makefile.in b/util/cairo-sphinx/Makefile.in
index cad110f..3905aca 100644
--- a/util/cairo-sphinx/Makefile.in
+++ b/util/cairo-sphinx/Makefile.in
@@ -41,14 +41,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -62,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -95,14 +93,18 @@ LTLIBRARIES = $(cairolib_LTLIBRARIES)
 cairo_sphinx_la_DEPENDENCIES =
 am_cairo_sphinx_la_OBJECTS = cairo_sphinx_la-fdr.lo
 cairo_sphinx_la_OBJECTS = $(am_cairo_sphinx_la_OBJECTS)
-cairo_sphinx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(cairo_sphinx_la_CFLAGS) \
-	$(CFLAGS) $(cairo_sphinx_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+cairo_sphinx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(cairo_sphinx_la_CFLAGS) $(CFLAGS) $(cairo_sphinx_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
 am_cairo_sphinx_OBJECTS = cairo_sphinx-sphinx.$(OBJEXT)
 cairo_sphinx_OBJECTS = $(am_cairo_sphinx_OBJECTS)
 am__DEPENDENCIES_1 =
-cairo_sphinx_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+cairo_sphinx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(cairo_sphinx_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -111,10 +113,26 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(cairo_sphinx_la_SOURCES) $(cairo_sphinx_SOURCES)
 DIST_SOURCES = $(cairo_sphinx_la_SOURCES) $(cairo_sphinx_SOURCES)
 ETAGS = etags
@@ -122,7 +140,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -159,7 +177,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -167,8 +184,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -197,17 +212,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -224,10 +235,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -236,7 +243,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -258,7 +264,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -313,11 +318,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
@@ -352,8 +360,9 @@ cairo_sphinx_la_LDFLAGS = -module -no-undefined
 cairo_sphinx_la_LIBADD = -ldl
 cairo_sphinx_SOURCES = sphinx.c
 cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
-cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(glib_CFLAGS)
+cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)  $(glib_CFLAGS)
 cairo_sphinx_LDADD = \
+	$(real_pthread_LIBS)					\
         $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
 	$(top_builddir)/src/libcairo.la 			\
@@ -432,7 +441,7 @@ clean-cairolibLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 cairo-sphinx.la: $(cairo_sphinx_la_OBJECTS) $(cairo_sphinx_la_DEPENDENCIES) 
-	$(cairo_sphinx_la_LINK) -rpath $(cairolibdir) $(cairo_sphinx_la_OBJECTS) $(cairo_sphinx_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(cairo_sphinx_la_LINK) -rpath $(cairolibdir) $(cairo_sphinx_la_OBJECTS) $(cairo_sphinx_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -478,7 +487,7 @@ clean-binPROGRAMS:
 	rm -f $$list
 cairo-sphinx$(EXEEXT): $(cairo_sphinx_OBJECTS) $(cairo_sphinx_DEPENDENCIES) 
 	@rm -f cairo-sphinx$(EXEEXT)
-	$(cairo_sphinx_LINK) $(cairo_sphinx_OBJECTS) $(cairo_sphinx_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(cairo_sphinx_LINK) $(cairo_sphinx_OBJECTS) $(cairo_sphinx_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -490,43 +499,49 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_sphinx_la-fdr.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 cairo_sphinx_la-fdr.lo: fdr.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_la_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_la_CFLAGS) $(CFLAGS) -MT cairo_sphinx_la-fdr.lo -MD -MP -MF $(DEPDIR)/cairo_sphinx_la-fdr.Tpo -c -o cairo_sphinx_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cairo_sphinx_la-fdr.Tpo $(DEPDIR)/cairo_sphinx_la-fdr.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_la_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_la_CFLAGS) $(CFLAGS) -MT cairo_sphinx_la-fdr.lo -MD -MP -MF $(DEPDIR)/cairo_sphinx_la-fdr.Tpo -c -o cairo_sphinx_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo_sphinx_la-fdr.Tpo $(DEPDIR)/cairo_sphinx_la-fdr.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fdr.c' object='cairo_sphinx_la-fdr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_la_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_la_CFLAGS) $(CFLAGS) -c -o cairo_sphinx_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_la_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_la_CFLAGS) $(CFLAGS) -c -o cairo_sphinx_la-fdr.lo `test -f 'fdr.c' || echo '$(srcdir)/'`fdr.c
 
 cairo_sphinx-sphinx.o: sphinx.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -MT cairo_sphinx-sphinx.o -MD -MP -MF $(DEPDIR)/cairo_sphinx-sphinx.Tpo -c -o cairo_sphinx-sphinx.o `test -f 'sphinx.c' || echo '$(srcdir)/'`sphinx.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cairo_sphinx-sphinx.Tpo $(DEPDIR)/cairo_sphinx-sphinx.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -MT cairo_sphinx-sphinx.o -MD -MP -MF $(DEPDIR)/cairo_sphinx-sphinx.Tpo -c -o cairo_sphinx-sphinx.o `test -f 'sphinx.c' || echo '$(srcdir)/'`sphinx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo_sphinx-sphinx.Tpo $(DEPDIR)/cairo_sphinx-sphinx.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sphinx.c' object='cairo_sphinx-sphinx.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -c -o cairo_sphinx-sphinx.o `test -f 'sphinx.c' || echo '$(srcdir)/'`sphinx.c
 
 cairo_sphinx-sphinx.obj: sphinx.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -MT cairo_sphinx-sphinx.obj -MD -MP -MF $(DEPDIR)/cairo_sphinx-sphinx.Tpo -c -o cairo_sphinx-sphinx.obj `if test -f 'sphinx.c'; then $(CYGPATH_W) 'sphinx.c'; else $(CYGPATH_W) '$(srcdir)/sphinx.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cairo_sphinx-sphinx.Tpo $(DEPDIR)/cairo_sphinx-sphinx.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -MT cairo_sphinx-sphinx.obj -MD -MP -MF $(DEPDIR)/cairo_sphinx-sphinx.Tpo -c -o cairo_sphinx-sphinx.obj `if test -f 'sphinx.c'; then $(CYGPATH_W) 'sphinx.c'; else $(CYGPATH_W) '$(srcdir)/sphinx.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cairo_sphinx-sphinx.Tpo $(DEPDIR)/cairo_sphinx-sphinx.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sphinx.c' object='cairo_sphinx-sphinx.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cairo_sphinx_CPPFLAGS) $(CPPFLAGS) $(cairo_sphinx_CFLAGS) $(CFLAGS) -c -o cairo_sphinx-sphinx.obj `if test -f 'sphinx.c'; then $(CYGPATH_W) 'sphinx.c'; else $(CYGPATH_W) '$(srcdir)/sphinx.c'; fi`
diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c
index 067f816..40d6776 100644
--- a/util/cairo-sphinx/sphinx.c
+++ b/util/cairo-sphinx/sphinx.c
@@ -23,6 +23,10 @@
 
 #include <glib.h> /* for checksumming */
 
+#ifndef CAIRO_HAS_REAL_PTHREAD
+# error "cairo-sphinx needs real pthreads"
+#endif
+
 #define DATA_SIZE (256 << 20)
 #define SHM_PATH_XXX "/shmem-cairo-sphinx"
 
diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am
index a792cc6..3278abe 100644
--- a/util/cairo-trace/Makefile.am
+++ b/util/cairo-trace/Makefile.am
@@ -10,10 +10,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
 libcairo_trace_la_SOURCES = trace.c
 libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \
 			  $(AM_CPPFLAGS)
-libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS)
+libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
 libcairo_trace_la_LDFLAGS = -no-undefined
 
-libcairo_trace_la_LIBADD = -lz $(PTHREAD_LIBS)
+libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz
 if CAIRO_HAS_DL
 libcairo_trace_la_LIBADD += -ldl
 endif
diff --git a/util/cairo-trace/Makefile.in b/util/cairo-trace/Makefile.in
index 562ad2f..9425b21 100644
--- a/util/cairo-trace/Makefile.in
+++ b/util/cairo-trace/Makefile.in
@@ -47,14 +47,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.compare.m4 \
-	$(top_srcdir)/build/aclocal.dolt.m4 \
 	$(top_srcdir)/build/aclocal.enable.m4 \
 	$(top_srcdir)/build/aclocal.float.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
-	$(top_srcdir)/build/aclocal.shave.m4 \
-	$(top_srcdir)/build/ax-pthread.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -68,6 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
 	$(top_srcdir)/build/configure.ac.noversion \
+	$(top_srcdir)/build/configure.ac.pthread \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -109,8 +107,11 @@ am__libcairo_trace_la_SOURCES_DIST = trace.c lookup-symbol.c \
 am_libcairo_trace_la_OBJECTS = libcairo_trace_la-trace.lo \
 	$(am__objects_1)
 libcairo_trace_la_OBJECTS = $(am_libcairo_trace_la_OBJECTS)
-libcairo_trace_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libcairo_trace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libcairo_trace_la_CFLAGS) $(CFLAGS) \
 	$(libcairo_trace_la_LDFLAGS) $(LDFLAGS) -o $@
 SCRIPTS = $(bin_SCRIPTS)
@@ -120,10 +121,26 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcairo_trace_la_SOURCES)
 DIST_SOURCES = $(am__libcairo_trace_la_SOURCES_DIST)
 ETAGS = etags
@@ -131,7 +148,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -168,7 +185,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOLT_BASH = @DOLT_BASH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -176,8 +192,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -206,17 +220,13 @@ LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -233,10 +243,6 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -245,7 +251,6 @@ SHLIB_EXT = @SHLIB_EXT@
 SHM_LIBS = @SHM_LIBS@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
-V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -267,7 +272,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -322,11 +326,14 @@ png_REQUIRES = @png_REQUIRES@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pthread_CFLAGS = @pthread_CFLAGS@
+pthread_LIBS = @pthread_LIBS@
 qt_CFLAGS = @qt_CFLAGS@
 qt_LIBS = @qt_LIBS@
+real_pthread_CFLAGS = @real_pthread_CFLAGS@
+real_pthread_LIBS = @real_pthread_LIBS@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 shm_LIBS = @shm_LIBS@
 skia_DIR = @skia_DIR@
 srcdir = @srcdir@
@@ -358,9 +365,9 @@ libcairo_trace_la_SOURCES = trace.c $(am__append_2)
 libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \
 			  $(AM_CPPFLAGS)
 
-libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS)
+libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
 libcairo_trace_la_LDFLAGS = -no-undefined
-libcairo_trace_la_LIBADD = -lz $(PTHREAD_LIBS) $(am__append_1) \
+libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz $(am__append_1) \
 	$(am__append_3)
 EXTRA_DIST = \
 	COPYING \
@@ -435,7 +442,7 @@ clean-cairolibLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcairo-trace.la: $(libcairo_trace_la_OBJECTS) $(libcairo_trace_la_DEPENDENCIES) 
-	$(libcairo_trace_la_LINK) -rpath $(cairolibdir) $(libcairo_trace_la_OBJECTS) $(libcairo_trace_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libcairo_trace_la_LINK) -rpath $(cairolibdir) $(libcairo_trace_la_OBJECTS) $(libcairo_trace_la_LIBADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -481,39 +488,44 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_trace_la-trace.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libcairo_trace_la-trace.lo: trace.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -MT libcairo_trace_la-trace.lo -MD -MP -MF $(DEPDIR)/libcairo_trace_la-trace.Tpo -c -o libcairo_trace_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_trace_la-trace.Tpo $(DEPDIR)/libcairo_trace_la-trace.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -MT libcairo_trace_la-trace.lo -MD -MP -MF $(DEPDIR)/libcairo_trace_la-trace.Tpo -c -o libcairo_trace_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_trace_la-trace.Tpo $(DEPDIR)/libcairo_trace_la-trace.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trace.c' object='libcairo_trace_la-trace.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -c -o libcairo_trace_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -c -o libcairo_trace_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
 
 libcairo_trace_la-lookup-symbol.lo: lookup-symbol.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -MT libcairo_trace_la-lookup-symbol.lo -MD -MP -MF $(DEPDIR)/libcairo_trace_la-lookup-symbol.Tpo -c -o libcairo_trace_la-lookup-symbol.lo `test -f 'lookup-symbol.c' || echo '$(srcdir)/'`lookup-symbol.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcairo_trace_la-lookup-symbol.Tpo $(DEPDIR)/libcairo_trace_la-lookup-symbol.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -MT libcairo_trace_la-lookup-symbol.lo -MD -MP -MF $(DEPDIR)/libcairo_trace_la-lookup-symbol.Tpo -c -o libcairo_trace_la-lookup-symbol.lo `test -f 'lookup-symbol.c' || echo '$(srcdir)/'`lookup-symbol.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_trace_la-lookup-symbol.Tpo $(DEPDIR)/libcairo_trace_la-lookup-symbol.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lookup-symbol.c' object='libcairo_trace_la-lookup-symbol.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -c -o libcairo_trace_la-lookup-symbol.lo `test -f 'lookup-symbol.c' || echo '$(srcdir)/'`lookup-symbol.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcairo_trace_la_CPPFLAGS) $(CPPFLAGS) $(libcairo_trace_la_CFLAGS) $(CFLAGS) -c -o libcairo_trace_la-lookup-symbol.lo `test -f 'lookup-symbol.c' || echo '$(srcdir)/'`lookup-symbol.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c
index 6dd58db..acdde93 100644
--- a/util/cairo-trace/trace.c
+++ b/util/cairo-trace/trace.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <dlfcn.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -51,6 +50,11 @@
 # include <cairo-ft.h>
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
 #ifndef CAIRO_TRACE_OUTDIR
 #define CAIRO_TRACE_OUTDIR "."
 #endif
@@ -157,8 +161,8 @@ struct _object {
     Type *type;
     unsigned long int token;
     int width, height;
-    bool foreign;
-    bool defined;
+    cairo_bool_t foreign;
+    cairo_bool_t defined;
     int operand;
     void *data;
     void (*destroy)(void *);
@@ -196,10 +200,10 @@ static struct _type_table {
 } Types;
 
 static FILE *logfile;
-static bool _flush;
-static bool _error;
-static bool _line_info;
-static bool _mark_dirty;
+static cairo_bool_t _flush;
+static cairo_bool_t _error;
+static cairo_bool_t _line_info;
+static cairo_bool_t _mark_dirty;
 static const cairo_user_data_key_t destroy_key;
 static pthread_once_t once_control = PTHREAD_ONCE_INIT;
 static pthread_key_t counter_key;
@@ -216,7 +220,7 @@ static void _init_trace (void);
 #else
 static void _enter_trace (void);
 static void _exit_trace (void);
-static bool _should_trace (void);
+static cairo_bool_t _should_trace (void);
 # define USE_ENTER_EXIT 1
 #endif
 
@@ -418,8 +422,8 @@ _object_create (Type *type, const void *ptr)
     int bucket = BUCKET (type->objects, ptr);
 
     obj = malloc (sizeof (Object));
-    obj->defined = false;
-    obj->foreign = false;
+    obj->defined = FALSE;
+    obj->foreign = FALSE;
     obj->operand = -1;
     obj->type = type;
     obj->addr = ptr;
@@ -460,7 +464,7 @@ _exit_trace (void)
     _get_counter ()[0]--;
 }
 
-static bool
+static cairo_bool_t
 _should_trace (void)
 {
     return _get_counter ()[0] <= 1;
@@ -768,28 +772,28 @@ _emit_header (void)
     _trace_printf ("%%*** Warning CairoScript is still a new tracing format, and is subject to change.\n");
 }
 
-static bool
+static cairo_bool_t
 _init_logfile (void)
 {
-    static bool initialized;
+    static cairo_bool_t initialized;
     const char *filename;
     const char *env;
 
     if (initialized)
 	return logfile != NULL;
 
-    initialized = true;
+    initialized = TRUE;
 
     env = getenv ("CAIRO_TRACE_FLUSH");
     if (env != NULL)
 	_flush = atoi (env);
 
-    _line_info = true;
+    _line_info = TRUE;
     env = getenv ("CAIRO_TRACE_LINE_INFO");
     if (env != NULL)
 	_line_info = atoi (env);
 
-    _mark_dirty = true;
+    _mark_dirty = TRUE;
     env = getenv ("CAIRO_TRACE_MARK_DIRTY");
     if (env != NULL)
 	_mark_dirty = atoi (env);
@@ -798,13 +802,13 @@ _init_logfile (void)
     if (filename != NULL) {
 	int fd = atoi (filename);
 	if (fd == -1)
-	    return false;
+	    return FALSE;
 
 	logfile = fdopen (fd, "w");
 	if (logfile == NULL) {
 	    fprintf (stderr, "Failed to open trace file descriptor '%s': %s\n",
 		       filename, strerror (errno));
-	    return false;
+	    return FALSE;
 	}
 
 	setenv ("CAIRO_TRACE_FD", "-1", 1);
@@ -835,7 +839,7 @@ _init_logfile (void)
     if (logfile == NULL) {
 	fprintf (stderr, "Failed to open trace file '%s': %s\n",
 		   filename, strerror (errno));
-	return false;
+	return FALSE;
     }
 
     fprintf (stderr, "cairo-trace: Recording cairo trace data to %s\n",
@@ -844,25 +848,25 @@ _init_logfile (void)
 done:
     atexit (_close_trace);
     _emit_header ();
-    return true;
+    return TRUE;
 }
 
-static bool
+static cairo_bool_t
 _write_lock (void)
 {
     if (_error)
-	return false;
+	return FALSE;
 
     if (! _should_trace ())
-	return false;
+	return FALSE;
 
     if (! _init_logfile ())
-	return false;
+	return FALSE;
 
 #if HAVE_FLOCKFILE && HAVE_FUNLOCKFILE
     flockfile (logfile);
 #endif
-    return true;
+    return TRUE;
 }
 
 static void
@@ -942,7 +946,7 @@ _consume_operand (void)
 	_trace_printf ("dup /%s%ld exch def\n",
 		       obj->type->op_code,
 		       obj->token);
-	obj->defined = true;
+	obj->defined = TRUE;
     }
     obj->operand = -1;
 }
@@ -961,16 +965,16 @@ _exch_operands (void)
     tmp->operand++;
 }
 
-static bool
+static cairo_bool_t
 _pop_operands_to_object (Object *obj)
 {
     if (obj->operand == -1)
-	return false;
+	return FALSE;
 
     if (obj->operand == current_stack_depth - 2) {
 	_exch_operands ();
 	_trace_printf ("exch ");
-	return true;
+	return TRUE;
     }
 
     while (current_stack_depth > obj->operand + 1) {
@@ -983,31 +987,31 @@ _pop_operands_to_object (Object *obj)
 	    _trace_printf ("/%s%ld exch def\n",
 		     c_obj->type->op_code,
 		     c_obj->token);
-	    c_obj->defined = true;
+	    c_obj->defined = TRUE;
 	} else {
 	    _trace_printf ("pop %% %s%ld\n",
 			   c_obj->type->op_code, c_obj->token);
 	}
     }
 
-    return true;
+    return TRUE;
 }
 
-static bool
+static cairo_bool_t
 _pop_operands_to (enum operand_type t, const void *ptr)
 {
     return _pop_operands_to_object (_get_object (t, ptr));
 }
 
-static bool
+static cairo_bool_t
 _is_current_object (Object *obj, int depth)
 {
     if (current_stack_depth <= depth)
-	return false;
+	return FALSE;
     return current_object[current_stack_depth-depth-1] == obj;
 }
 
-static bool
+static cairo_bool_t
 _is_current (enum operand_type type, const void *ptr, int depth)
 {
     return _is_current_object (_get_object (type, ptr), depth);
@@ -1110,14 +1114,14 @@ _get_id (enum operand_type op_type, const void *ptr)
 	    _trace_printf ("%% Unknown object of type %s, trace is incomplete.",
 			   _get_type (op_type)->name);
 	}
-	_error = true;
+	_error = TRUE;
 	return -1;
     }
 
     return obj->token;
 }
 
-static bool
+static cairo_bool_t
 _has_id (enum operand_type op_type, const void *ptr)
 {
     return _get_object (op_type, ptr) != NULL;
@@ -1165,7 +1169,7 @@ _emit_font_face_id (cairo_font_face_t *font_face)
     }
 }
 
-static bool
+static cairo_bool_t
 _has_pattern_id (cairo_pattern_t *pattern)
 {
     return _has_id (PATTERN, pattern);
@@ -1223,13 +1227,13 @@ _get_scaled_font_id (const cairo_scaled_font_t *font)
     return _get_id (SCALED_FONT, font);
 }
 
-static bool
+static cairo_bool_t
 _has_scaled_font_id (const cairo_scaled_font_t *font)
 {
     return _has_id (SCALED_FONT, font);
 }
 
-static bool
+static cairo_bool_t
 _has_surface_id (const cairo_surface_t *surface)
 {
     return _has_id (SURFACE, surface);
@@ -1256,7 +1260,7 @@ _get_surface_id (cairo_surface_t *surface)
     return _get_id (SURFACE, surface);
 }
 
-static bool
+static cairo_bool_t
 _matrix_is_identity (const cairo_matrix_t *m)
 {
     return m->xx == 1. && m->yx == 0. &&
@@ -1294,13 +1298,13 @@ _write_base85_data_start (struct _data_stream *stream)
     stream->base85_pending = 0;
 }
 
-static bool
+static cairo_bool_t
 _expand_four_tuple_to_five (unsigned char four_tuple[4],
 			    unsigned char five_tuple[5])
 {
     uint32_t value;
     int digit, i;
-    bool all_zero = true;
+    cairo_bool_t all_zero = TRUE;
 
     value = four_tuple[0] << 24 |
 	    four_tuple[1] << 16 |
@@ -1309,7 +1313,7 @@ _expand_four_tuple_to_five (unsigned char four_tuple[4],
     for (i = 0; i < 5; i++) {
 	digit = value % 85;
 	if (digit != 0 && all_zero)
-	    all_zero = false;
+	    all_zero = FALSE;
 	five_tuple[4-i] = digit + 33;
 	value = value / 85;
     }
@@ -1320,7 +1324,7 @@ _expand_four_tuple_to_five (unsigned char four_tuple[4],
 static void
 _write_base85_data (struct _data_stream *stream,
 		    const unsigned char	  *data,
-		    unsigned int	   length)
+		    unsigned long	   length)
 {
     unsigned char five_tuple[5];
     int ret;
@@ -1340,9 +1344,9 @@ _write_base85_data (struct _data_stream *stream,
 }
 
 static void
-_write_zlib_data (struct _data_stream *stream, bool flush)
+_write_zlib_data (struct _data_stream *stream, cairo_bool_t flush)
 {
-    bool finished;
+    cairo_bool_t finished;
 
     do {
 	int ret = deflate (&stream->zlib_stream, flush ? Z_FINISH : Z_NO_FLUSH);
@@ -1354,11 +1358,11 @@ _write_zlib_data (struct _data_stream *stream, bool flush)
 	    stream->zlib_stream.avail_out = BUFFER_SIZE;
 	}
 
-	finished = true;
+	finished = TRUE;
 	if (stream->zlib_stream.avail_in != 0)
-	    finished = false;
+	    finished = FALSE;
 	if (flush && ret != Z_STREAM_END)
-	    finished = false;
+	    finished = FALSE;
     } while (! finished);
 
     stream->zlib_stream.next_in = stream->zin_buf;
@@ -1393,14 +1397,14 @@ _write_data (struct _data_stream *stream,
 	length -= count;
 
 	if (stream->zlib_stream.avail_in == BUFFER_SIZE)
-	    _write_zlib_data (stream, false);
+	    _write_zlib_data (stream, FALSE);
     }
 }
 
 static void
 _write_zlib_data_end (struct _data_stream *stream)
 {
-    _write_zlib_data (stream, true);
+    _write_zlib_data (stream, TRUE);
     deflateEnd (&stream->zlib_stream);
 
 }
@@ -1555,7 +1559,7 @@ _emit_image (cairo_surface_t *image,
 
 	for (mime_type = mime_types; *mime_type; mime_type++) {
 	    const unsigned char *mime_data;
-	    unsigned int mime_length;
+	    unsigned long mime_length;
 
 	    DLCALL (cairo_surface_get_mime_data,
 		    image, *mime_type, &mime_data, &mime_length);
@@ -1899,7 +1903,7 @@ cairo_create (cairo_surface_t *target)
     if (target != NULL && _write_lock ()) {
 	surface_id = _get_surface_id (target);
 	if (surface_id != -1) {
-	    _get_object (SURFACE, target)->foreign = false;
+	    _get_object (SURFACE, target)->foreign = FALSE;
 
 	    /* we presume that we will continue to use the context */
 	    if (_pop_operands_to (SURFACE, target)){
@@ -2089,7 +2093,7 @@ _emit_source_image (cairo_surface_t *surface)
     _trace_printf (" set-source-image ");
     DLCALL (cairo_surface_destroy, image);
 
-    obj->foreign = false;
+    obj->foreign = FALSE;
 }
 
 static void
@@ -2169,14 +2173,14 @@ cairo_set_source (cairo_t *cr, cairo_pattern_t *source)
     _emit_line_info ();
     if (cr != NULL && source != NULL && _write_lock ()) {
 	Object *obj = _get_object (PATTERN, source);
-	bool need_context_and_pattern = true;
+	cairo_bool_t need_context_and_pattern = TRUE;
 
 	if (_is_current (PATTERN, source, 0) &&
 	    _is_current (CONTEXT, cr, 1))
 	{
 	    if (obj->defined) {
 		_consume_operand ();
-		need_context_and_pattern = false;
+		need_context_and_pattern = FALSE;
 	    }
 	}
 	else if (_is_current (PATTERN, source, 1) &&
@@ -2186,7 +2190,7 @@ cairo_set_source (cairo_t *cr, cairo_pattern_t *source)
 		_trace_printf ("exch ");
 		_exch_operands ();
 		_consume_operand ();
-		need_context_and_pattern = false;
+		need_context_and_pattern = FALSE;
 	    }
 	}
 
@@ -2215,7 +2219,7 @@ cairo_get_source (cairo_t *cr)
     if (! _has_pattern_id (ret)) {
 	_emit_cairo_op (cr, "/source get /p%ld exch def\n",
 			_create_pattern_id (ret));
-	_get_object (PATTERN, ret)->defined = true;
+	_get_object (PATTERN, ret)->defined = TRUE;
     }
 
     _exit_trace ();
@@ -2445,7 +2449,7 @@ cairo_get_target (cairo_t *cr)
 
     if (cr != NULL && ! _has_surface_id (ret)) {
 	_emit_cairo_op (cr, "/target get /s%ld exch def\n", surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
     }
 
     _exit_trace ();
@@ -2465,7 +2469,7 @@ cairo_get_group_target (cairo_t *cr)
 
     if (cr != NULL && ! _has_surface_id (ret)) {
 	_emit_cairo_op (cr, "/group-target get /s%ld exch def\n", surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
     }
 
     _exit_trace ();
@@ -2620,14 +2624,14 @@ cairo_mask (cairo_t *cr, cairo_pattern_t *pattern)
     _emit_line_info ();
     if (cr != NULL && pattern != NULL && _write_lock ()) {
 	Object *obj = _get_object (PATTERN, pattern);
-	bool need_context_and_pattern = true;
+	cairo_bool_t need_context_and_pattern = TRUE;
 
 	if (_is_current (PATTERN, pattern, 0) &&
 	    _is_current (CONTEXT, cr, 1))
 	{
 	    if (obj->defined) {
 		_consume_operand ();
-		need_context_and_pattern = false;
+		need_context_and_pattern = FALSE;
 	    }
 	}
 	else if (_is_current (PATTERN, pattern, 1) &&
@@ -2637,7 +2641,7 @@ cairo_mask (cairo_t *cr, cairo_pattern_t *pattern)
 		_trace_printf ("exch ");
 		_exch_operands ();
 		_consume_operand ();
-		need_context_and_pattern = false;
+		need_context_and_pattern = FALSE;
 	    }
 	}
 
@@ -3001,7 +3005,7 @@ cairo_get_scaled_font (cairo_t *cr)
     if (cr != NULL && ! _has_scaled_font_id (ret)) {
 	_emit_cairo_op (cr, "/scaled-font get /sf%ld exch def\n",
 			_create_scaled_font_id (ret));
-	_get_object (SCALED_FONT, ret)->defined = true;
+	_get_object (SCALED_FONT, ret)->defined = TRUE;
     }
 
     _exit_trace ();
@@ -3101,7 +3105,7 @@ cairo_scaled_font_create (cairo_font_face_t *font_face,
 			   scaled_font_id);
 	    _push_operand (SCALED_FONT, ret);
 
-	    _get_object (SCALED_FONT, ret)->defined = true;
+	    _get_object (SCALED_FONT, ret)->defined = TRUE;
 	}
 
 	_write_unlock ();
@@ -3160,10 +3164,10 @@ _emit_glyphs (cairo_scaled_font_t *font,
     x = glyphs->x;
     y = glyphs->y;
     if (n < num_glyphs) { /* need full glyph range */
-	bool first;
+	cairo_bool_t first;
 
 	_trace_printf ("[%g %g [", x, y);
-	first = true;
+	first = TRUE;
 	while (num_glyphs--) {
 	    if (fabs (glyphs->x - x) > TOLERANCE ||
 		fabs (glyphs->y - y) > TOLERANCE)
@@ -3171,13 +3175,13 @@ _emit_glyphs (cairo_scaled_font_t *font,
 		x = glyphs->x;
 		y = glyphs->y;
 		_trace_printf ("] %g %g [", x, y);
-		first = true;
+		first = TRUE;
 	    }
 
 	    if (! first)
 		_trace_printf (" ");
 	    _trace_printf ("%lu", glyphs->index);
-	    first = false;
+	    first = FALSE;
 
 	    _glyph_advance (font, glyphs, &x, &y);
 	    glyphs++;
@@ -3397,7 +3401,7 @@ cairo_image_surface_create (cairo_format_t format, int width, int height)
 		       width, height, format_str, surface_id);
 	_get_object (SURFACE, ret)->width = width;
 	_get_object (SURFACE, ret)->height = height;
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -3442,12 +3446,12 @@ cairo_image_surface_create_for_data (unsigned char *data, cairo_format_t format,
 			   _format_to_string (format),
 			   surface_id);
 
-	    _get_object (SURFACE, ret)->foreign = true;
+	    _get_object (SURFACE, ret)->foreign = TRUE;
 	}
 
 	_get_object (SURFACE, ret)->width  = width;
 	_get_object (SURFACE, ret)->height = height;
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -3652,7 +3656,7 @@ cairo_status_t
 cairo_surface_set_mime_data (cairo_surface_t		*surface,
                              const char			*mime_type,
                              const unsigned char	*data,
-                             unsigned int		 length,
+                             unsigned long		 length,
 			     cairo_destroy_func_t	 destroy,
 			     void			*closure)
 {
@@ -3756,7 +3760,7 @@ cairo_pattern_create_rgb (double red, double green, double blue)
     if (_write_lock ()) {
 	_trace_printf ("/p%ld %g %g %g rgb def\n",
 		       pattern_id, red, green, blue);
-	_get_object (PATTERN, ret)->defined = true;
+	_get_object (PATTERN, ret)->defined = TRUE;
 	_write_unlock ();
     }
 
@@ -3779,7 +3783,7 @@ cairo_pattern_create_rgba (double red, double green, double blue, double alpha)
     if (_write_lock ()) {
 	_trace_printf ("/p%ld %g %g %g %g rgba def\n",
 		       pattern_id, red, green, blue, alpha);
-	_get_object (PATTERN, ret)->defined = true;
+	_get_object (PATTERN, ret)->defined = TRUE;
 	_write_unlock ();
     }
 
@@ -4060,7 +4064,7 @@ cairo_ft_font_face_create_for_ft_face (FT_Face face, int load_flags)
     return ret;
 }
 
-static bool
+static cairo_bool_t
 _ft_read_file (FtFaceData *data, const char *path)
 {
     char buf[8192];
@@ -4084,7 +4088,7 @@ _ft_read_file (FtFaceData *data, const char *path)
 		allocated *= 2;
 		data->data = realloc (data->data, allocated);
 	    }
-	} while (true);
+	} while (TRUE);
 	fclose (file);
     }
 
@@ -4458,7 +4462,7 @@ cairo_image_surface_create_from_png (const char *filename)
 	_trace_printf (" dup /s%ld exch def\n",
 		       surface_id);
 	_surface_object_set_size_from_surface (ret);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4484,7 +4488,7 @@ cairo_image_surface_create_from_png_stream (cairo_read_func_t read_func, void *c
 	_trace_printf (" dup /s%ld exch def\n",
 		       surface_id);
 	_surface_object_set_size_from_surface (ret);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4532,9 +4536,9 @@ cairo_xlib_surface_create (Display *dpy,
 		       width,
 		       height,
 		       surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->foreign = true;
+	_get_object (SURFACE, ret)->foreign = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4573,9 +4577,9 @@ cairo_xlib_surface_create_for_bitmap (Display *dpy,
 		       width,
 		       height,
 		       surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->foreign = true;
+	_get_object (SURFACE, ret)->foreign = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4618,9 +4622,9 @@ cairo_xlib_surface_create_with_xrender_format (Display *dpy,
 		       height,
 		       format->depth,
 		       surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->foreign = true;
+	_get_object (SURFACE, ret)->foreign = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4659,7 +4663,7 @@ cairo_script_surface_create (cairo_device_t *device,
 		       width, height,
 		       surface_id);
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4686,7 +4690,7 @@ cairo_script_surface_create_for_target (cairo_device_t *device,
 		       "  /type /script set\n"
 		       "  surface dup /s%ld exch def\n",
 		       surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4723,7 +4727,7 @@ _cairo_test_fallback_surface_create (cairo_content_t	content,
 		       width, height,
 		       surface_id);
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4782,7 +4786,7 @@ _cairo_test_null_surface_create (cairo_content_t	content)
 		       "  surface dup /s%ld exch def\n",
 		       _content_to_string (content),
 		       surface_id);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4825,7 +4829,7 @@ cairo_recording_surface_create (cairo_content_t content,
 			   _content_to_string (content),
 			   surface_id);
 	}
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4861,7 +4865,7 @@ cairo_vg_surface_create (cairo_vg_context_t *context,
 		       width, height,
 		       surface_id);
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
@@ -4900,7 +4904,7 @@ cairo_vg_surface_create_for_image (cairo_vg_context_t *context,
 		       width, height,
 		       surface_id);
 	_surface_object_set_size (ret, width, height);
-	_get_object (SURFACE, ret)->defined = true;
+	_get_object (SURFACE, ret)->defined = TRUE;
 	_push_operand (SURFACE, ret);
 	_write_unlock ();
     }
author	Sebastian Dröge <sebastian.droege@collabora.co.uk>	2010-07-12 14:58:31 +0200
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>	2010-07-12 14:58:31 +0200
commit	dd132f63446980996966ab87a4eb34e4026a8895 (patch)
tree	ce8b0a90188c8779bbf38e7ee2a2f800cb19585c /util
parent	342796e34d0c9374c51f2ab70a85c5a9f6b97700 (diff)