summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2005-05-06 16:38:57 +0000
committerKristian Høgsberg <krh@redhat.com>2005-05-06 16:38:57 +0000
commit7d189e33cfa68e722561e9398ad85a77b538ab14 (patch)
tree9778711d90972c5b41e43abf45a0e4cfe8853a12 /configure.ac
parentc937e63f17a096b94a554103476ecb9ab1b71b90 (diff)
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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 41a54fae..5c1473a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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