[cairo-commit] 3 commits - configure.in doc/public test/Makefile.am

Behdad Esfahbod behdad at kemper.freedesktop.org
Tue Apr 3 13:27:38 PDT 2007


 configure.in          |    2 +-
 doc/public/Headers.mk |    1 +
 test/Makefile.am      |    9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
diff-tree b121468f14a6a05a823e06cf7c51caaa1e342556 (from 9710c48df31c66d8931a75b6578c7c861d497baa)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 3 16:27:50 2007 -0400

    [configure.in] Bump version up to 1.4.3, oops!
    Supposed to be done after 1.4.2 was out, but apparently didn't happen.

diff --git a/configure.in b/configure.in
index 8acca66..d0d84d2 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl An odd micro number indicates in-pro
 dnl An even micro number indicates a released version.
 m4_define(cairo_version_major, 1)
 m4_define(cairo_version_minor, 4)
-m4_define(cairo_version_micro, 2)
+m4_define(cairo_version_micro, 3)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
diff-tree 9710c48df31c66d8931a75b6578c7c861d497baa (from 040c68cb2ca6c893d9ba11291c21b1cf84fec980)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 3 16:26:48 2007 -0400

    [doc] Update Headers.mk

diff --git a/doc/public/Headers.mk b/doc/public/Headers.mk
index 638bcad..3194d23 100644
--- a/doc/public/Headers.mk
+++ b/doc/public/Headers.mk
@@ -20,6 +20,7 @@ PRIVATE_TEST_HFILES = \
 	cairo-ps-test.h \
 	cairo-quartz-private.h \
 	cairo-wideint-private.h \
+	cairo-mutex-private.h \
 	cairo-path-fixed-private.h \
 	cairo-private.h \
 	cairo-ft-private.h \
diff-tree 040c68cb2ca6c893d9ba11291c21b1cf84fec980 (from 17f5706d1730662bce0cd49f60cb150773fac051)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 3 16:23:35 2007 -0400

    [test] Make pdf2svg build (and distributed)

diff --git a/test/Makefile.am b/test/Makefile.am
index ee7ce6f..51daa3f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -429,6 +429,7 @@ multi-page			\
 fallback-resolution
 
 SUPPORT_PROGS =
+EXTRA_PROGRAMS =
 
 # We're using _GNU_SOURCE to get the prototype for asprintf. This may
 # not be the most portable approach, but it is pragmatic and I'm
@@ -478,6 +479,12 @@ SUPPORT_PROGS += pdf2png$(EXEEXT)
 pdf2png_CFLAGS = $(POPPLER_CFLAGS)
 # add LDADD, so poppler uses "our" cairo
 pdf2png_LDADD  = $(LDADD) $(POPPLER_LIBS)
+if CAIRO_HAS_SVG_SURFACE
+EXTRA_PROGRAMS += pdf2svg$(EXEEXT)
+pdf2svg_CFLAGS = $(POPPLER_CFLAGS)
+# add LDADD, so poppler uses "our" cairo
+pdf2svg_LDADD  = $(LDADD) $(POPPLER_LIBS)
+endif
 endif
 
 if CAIRO_CAN_TEST_SVG_SURFACE
@@ -487,7 +494,7 @@ svg2png_CFLAGS = $(LIBRSVG_CFLAGS)
 svg2png_LDADD  = $(LDADD) $(LIBRSVG_LIBS)
 endif
 
-EXTRA_PROGRAMS = $(TESTS) $(SUPPORT_PROGS)
+EXTRA_PROGRAMS += $(TESTS) $(SUPPORT_PROGS)
 
 # Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
 # one can limit tested targets both through CAIRO_TEST_TARGET env var


More information about the cairo-commit mailing list