I found that trying to build poppler-qt4 wrappers on fedora core 6
failed on x86_64 due to it's (let's say) "interesting" checks for qt4
headers and libraries.
Attached is a patch to simply use PKG_CHECK_MODULES (ie, pkg-config) for
qt4 (as well as qt) detection.
-- Rex
--- poppler-0.5.4/qt/Makefile.am.qt 2006-07-24 14:04:50.000000000 -0500
+++ poppler-0.5.4/qt/Makefile.am 2006-12-07 14:13:32.000000000 -0600
@@ -2,7 +2,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
$(cairo_includes) \
- $(POPPLER_QT_CXXFLAGS) \
+ $(POPPLER_QT_CFLAGS) \
$(SPLASH_CFLAGS) \
$(FREETYPE_CFLAGS)
--- poppler-0.5.4/configure.ac.qt 2006-09-21 18:22:02.000000000 -0500
+++ poppler-0.5.4/configure.ac 2006-12-07 14:13:12.000000000 -0600
@@ -203,14 +203,12 @@
enable_poppler_qt="try")
if test x$enable_poppler_qt = xyes; then
- POPPLER_FIND_QT(POPPLER_QT,,)
+ PKG_CHECK_MODULES(POPPLER_QT, qt-mt)
elif test x$enable_poppler_qt = xtry; then
- POPPLER_FIND_QT(POPPLER_QT,
+ PKG_CHECK_MODULES(POPPLER_QT, qt-mt,
[enable_poppler_qt="yes"],
[enable_poppler_qt="no"])
fi
-AC_SUBST(POPPLER_QT_CXXFLAGS)
-AC_SUBST(POPPLER_QT_LIBS)
if test x$enable_splash_output != xyes; then
if test x$enable_poppler_qt = xyes; then
enable_poppler_qt="no because of disabled splash"
@@ -228,15 +226,13 @@
enable_poppler_qt4="try")
if test x$enable_poppler_qt4 = xyes; then
- POPPLER_FIND_QT4(POPPLER_QT4)
+ PKG_CHECK_MODULES(POPPLER_QT4, QtGui QtXml)
elif test x$enable_poppler_qt4 = xtry; then
- POPPLER_FIND_QT4(POPPLER_QT4,
+ PKG_CHECK_MODULES(POPPLER_QT4, QtGui QtXml,
[enable_poppler_qt4="yes"],
[enable_poppler_qt4="no"])
fi
-AC_SUBST(POPPLER_QT4_CXXFLAGS)
-AC_SUBST(POPPLER_QT4_LIBS)
if test x$enable_splash_output != xyes; then
if test x$enable_poppler_qt4 = xyes; then
enable_poppler_qt4="no because of disabled splash"
@@ -245,11 +241,9 @@
AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
if test x$enable_poppler_qt4 = xyes; then
- POPPLER_FIND_QT4TEST(POPPLER_QTTEST,
+ PKG_CHECK_MODULES(POPPLER_QTTEST, QtTest,
[enable_poppler_qt4testlib="yes"],
[enable_poppler_qt4testlib="no"])
- AC_SUBST(POPPLER_QTTEST_CXXFLAGS)
- AC_SUBST(POPPLER_QTTEST_LIBS)
else
enable_poppler_qt4testlib="no"
fi
--- poppler-0.5.4/qt4/src/Makefile.am.qt 2006-12-07 14:09:30.000000000 -0600
+++ poppler-0.5.4/qt4/src/Makefile.am 2006-12-07 14:09:37.000000000 -0600
@@ -2,7 +2,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
-I$(top_srcdir)/qt \
- $(POPPLER_QT4_CXXFLAGS)
+ $(POPPLER_QT4_CFLAGS)
poppler_includedir = $(includedir)/poppler
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
