[poppler] poppler/poppler: Makefile.am,1.24,1.25

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv25163/poppler

Modified Files:
	Makefile.am 
Log Message:
2006-09-13  Kristian Høgsberg  <krh at redhat.com>

	* poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
	link if configured.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	24 Jul 2006 19:49:51 -0000	1.24
+++ Makefile.am	18 Sep 2006 15:40:50 -0000	1.25
@@ -39,6 +39,9 @@
 cairo_includes =				\
 	$(CAIRO_CFLAGS)
 
+cairo_libs =					\
+	$(CAIRO_LIBS)
+
 libpoppler_cairo_la_SOURCES =			\
 	CairoFontEngine.cc			\
 	CairoFontEngine.h			\
@@ -87,6 +90,7 @@
 	$(top_builddir)/goo/libgoo.la		\
 	$(top_builddir)/fofi/libfofi.la		\
 	$(splash_libs)				\
+	$(cairo_libs)				\
 	$(libjpeg_libs)				\
 	$(zlib_libs)				\
 	$(FREETYPE_LIBS)			\