diff options
author | Kristian Høgsberg <krh@redhat.com> | 2006-09-18 15:40:50 +0000 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2006-09-18 15:40:50 +0000 |
commit | 821c883f9df9cc0e5b81aa2e070727996cf3bc4e (patch) | |
tree | 4804303a57b3263e61b83e85e46eb54db881f92c | |
parent | d8ab8ebc94c32d32ad17ed54cede453de25d7dd5 (diff) |
2006-09-13 Kristian Høgsberg <krh@redhat.com>
* poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
link if configured.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | poppler/Makefile.am | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -1,5 +1,8 @@ 2006-09-13 Kristian Høgsberg <krh@redhat.com> + * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to + link if configured. + * configure.ac: Tighten glib check (#7906), add check for C++ compiler (#8048). diff --git a/poppler/Makefile.am b/poppler/Makefile.am index 25928535..6c5fea1c 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -39,6 +39,9 @@ poppler_cairo = libpoppler-cairo.la cairo_includes = \ $(CAIRO_CFLAGS) +cairo_libs = \ + $(CAIRO_LIBS) + libpoppler_cairo_la_SOURCES = \ CairoFontEngine.cc \ CairoFontEngine.h \ @@ -87,6 +90,7 @@ libpoppler_la_LIBADD = \ $(top_builddir)/goo/libgoo.la \ $(top_builddir)/fofi/libfofi.la \ $(splash_libs) \ + $(cairo_libs) \ $(libjpeg_libs) \ $(zlib_libs) \ $(FREETYPE_LIBS) \ |