- qt bcond added

[packages/poppler.git] / poppler-link.patch

diff -Nur poppler-0.2.0.orig/poppler/Makefile.am poppler-0.2.0/poppler/Makefile.am
--- poppler-0.2.0.orig/poppler/Makefile.am	2005-04-04 22:12:39.000000000 +0200
+++ poppler-0.2.0/poppler/Makefile.am	2005-04-06 12:00:12.000000000 +0200
@@ -61,7 +61,8 @@
 	$(top_builddir)/fofi/libfofi.la		\
 	$(splash_libs)				\
 	$(cairo_libs)				\
-	$(libjpeg_libs)
+	$(libjpeg_libs)				\
+ 	$(FREETYPE_LIBS) -lfontconfig
 
 poppler_includedir = $(includedir)/poppler
 poppler_include_HEADERS =	\
--- poppler-0.3.0/qt/Makefile.am.orig	2005-04-06 16:39:40.000000000 +0200
+++ poppler-0.3.0/qt/Makefile.am	2005-04-24 00:14:16.023876624 +0200
@@ -18,7 +18,8 @@
 
 libpoppler_qt_la_LIBADD= 			\
 	$(POPPLER_QT_LIBS)			\
-	$(FREETYPE_LIBS)
+	$(FREETYPE_LIBS)			\
+	../poppler/libpoppler.la
 
 noinst_PROGRAMS = test-poppler-qt
 
--- poppler-0.3.0/glib/Makefile.am.orig	2005-04-19 21:40:09.000000000 +0200
+++ poppler-0.3.0/glib/Makefile.am	2005-04-24 00:15:06.006278144 +0200
@@ -63,7 +63,7 @@
 libpoppler_glib_la_LIBADD =			\
 	$(POPPLER_GLIB_LIBS)			\
 	$(FREETYPE_LIBS)			\
-	$(cairo_libs)
+	../poppler/libpoppler.la
 
 noinst_PROGRAMS = test-poppler-glib