[poppler] poppler: ChangeLog, 1.84, 1.85 configure.ac, 1.20, 1.21 poppler-glib.pc.in, 1.3, 1.4 poppler-qt.pc.in, 1.2, 1.3

[Kristian Hogsberg]

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

Modified Files:
	ChangeLog configure.ac poppler-glib.pc.in poppler-qt.pc.in 
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: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	4 May 2005 20:08:41 -0000	1.84
+++ ChangeLog	6 May 2005 16:38:57 -0000	1.85
@@ -1,3 +1,17 @@
+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.
+
 2005-05-04  Kristian Høgsberg  <krh at redhat.com>
 
 	* poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask,

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.ac	2 May 2005 05:39:11 -0000	1.20
+++ configure.ac	6 May 2005 16:38:57 -0000	1.21
@@ -230,7 +230,8 @@
 
 dnl What to test
 qt_test_include="qstyle.h"
-qt_test_library="libqt-mt.la"
+qt_test_la_library="libqt-mt.la"
+qt_test_library="libqt-mt.so"
 
 dnl Check for Qt headers
 AC_MSG_CHECKING([for Qt headers])
@@ -247,6 +248,11 @@
 AC_MSG_CHECKING([for Qt libraries])
 qt_libdir="no"
 for qt_check in $qt_libdirs ; do
+    if test -r "$qt_check/$qt_test_la_library" ; then
+        qt_libdir="$qt_check"
+        break
+    fi
+
     if test -r "$qt_check/$qt_test_library" ; then
         qt_libdir="$qt_check"
         break

Index: poppler-glib.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-glib.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler-glib.pc.in	21 Apr 2005 05:20:24 -0000	1.3
+++ poppler-glib.pc.in	6 May 2005 16:38:57 -0000	1.4
@@ -8,5 +8,5 @@
 Version: @VERSION@
 Requires: gobject-2.0 gdk-pixbuf-2.0
 
-Libs: -L${libdir} -lpoppler -lpoppler-glib
+Libs: -L${libdir} -lpoppler-glib
 Cflags: -I${includedir}/poppler/glib

Index: poppler-qt.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-qt.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler-qt.pc.in	8 Apr 2005 21:09:27 -0000	1.2
+++ poppler-qt.pc.in	6 May 2005 16:38:57 -0000	1.3
@@ -7,5 +7,5 @@
 Description: Qt bindings for poppler
 Version: @VERSION@
 
-Libs: -L${libdir} -lpoppler -lpoppler-qt
+Libs: -L${libdir} -lpoppler-qt
 Cflags: -I${includedir}/poppler