From 2335a23a16d84e6ebdde7afbeb1fbceb3bdbe6b6 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 20 Feb 2007 01:00:17 -0500 Subject: [PATCH] [test/Makefile.am] Document why svg2png and pdf2png use LDADD This is to make librsvg and poppler to use the compiled cairo instead of whatever is on the system, such that the test suite does not depend on a good version of cairo being installed already. --- test/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 7eefc32f3..7eb4dd3a9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -421,13 +421,15 @@ SUPPORT_PROGS += imagediff png-flatten if CAIRO_CAN_TEST_PDF_SURFACE SUPPORT_PROGS += pdf2png pdf2png_CFLAGS = $(POPPLER_CFLAGS) -pdf2png_LDADD = $(LDADD) $(POPPLER_LIBS) +# add LDADD, so poppler uses "our" cairo +pdf2png_LDADD = $(LDADD) $(POPPLER_LIBS) endif if CAIRO_CAN_TEST_SVG_SURFACE SUPPORT_PROGS += svg2png svg2png_CFLAGS = $(LIBRSVG_CFLAGS) -svg2png_LDADD = $(LDADD) $(LIBRSVG_LIBS) +# add LDADD, so librsvg uses "our" cairo +svg2png_LDADD = $(LDADD) $(LIBRSVG_LIBS) endif EXTRA_PROGRAMS = $(TESTS) $(SUPPORT_PROGS)