Commit 7d189e33 authored by Kristian Høgsberg's avatar Kristian Høgsberg

2005-05-06 Kristian Høgsberg <krh@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.
parent c937e63f
2005-05-06 Kristian Høgsberg <krh@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@redhat.com>
* poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask,
......
......@@ -230,7 +230,8 @@ fi
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 @@ dnl Check for Qt libraries
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
......
......@@ -61,6 +61,7 @@ libpoppler_glib_la_SOURCES = \
poppler-private.h
libpoppler_glib_la_LIBADD = \
$(top_builddir)/poppler/libpoppler.la \
$(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
$(cairo_libs)
......
......@@ -8,5 +8,5 @@ Description: GLib wrapper for poppler
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
......@@ -7,5 +7,5 @@ Name: poppler-qt
Description: Qt bindings for poppler
Version: @VERSION@
Libs: -L${libdir} -lpoppler -lpoppler-qt
Libs: -L${libdir} -lpoppler-qt
Cflags: -I${includedir}/poppler
......@@ -18,6 +18,7 @@ libpoppler_qt_la_SOURCES = \
poppler-private.h
libpoppler_qt_la_LIBADD= \
$(top_builddir)/poppler/libpoppler.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
......
......@@ -2,6 +2,7 @@
#include <qpainter.h>
#include <qpixmap.h>
#include <qwidget.h>
#include <qlabel.h>
#include <qmessagebox.h>
#include <qfile.h>
#include <ctype.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment