[poppler] poppler/glib: Makefile.am,1.6,1.7

[Kristian Hogsberg]

Update of /cvs/poppler/poppler/glib
In directory gabe:/tmp/cvs-serv1441/glib

Modified Files:
	Makefile.am 
Log Message:
2005-05-06  Kristian Høgsberg  <krh at redhat.com>

        * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link poppler-glib
        against poppler.

        * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.

        * poppler-glib.pc (Libs): Drop -lpoppler from link.

        * poppler-qt.pc (Libs): Ditto for qt.

        * configure.ac: Test for both libqt-mt.la and libqt-mt.so in that
        order.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/glib/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	16 Apr 2005 18:57:44 -0000	1.6
+++ Makefile.am	6 May 2005 16:38:57 -0000	1.7
@@ -61,6 +61,7 @@
 	poppler-private.h
 
 libpoppler_glib_la_LIBADD =			\
+	$(top_builddir)/poppler/libpoppler.la	\
 	$(POPPLER_GLIB_LIBS)			\
 	$(FREETYPE_LIBS)			\
 	$(cairo_libs)