G'day, The attached patch basically changes the configure checks for Qt4 to use pkg-config.
There is a bit more work to do on this (removing the unused bits from m4/qt.m4, and probably adding some magic to poppler-qt4.pc.in). I'm not sure how to handle Qt4 with either release or debug versions, which changes the suffix. I'm looking at the old dbus code to see if that can help. Any objections to this change? Brad
? poppler-qt4-pkgconfig-2006-09-23.patch
Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.65
diff -u -r1.65 configure.ac
--- configure.ac 21 Sep 2006 23:28:14 -0000 1.65
+++ configure.ac 1 Oct 2006 07:57:24 -0000
@@ -221,22 +221,22 @@
dnl
dnl Try Qt4
dnl
-AC_ARG_ENABLE(poppler-qt4,
- AC_HELP_STRING([--disable-poppler-qt4],
- [Don't compile poppler Qt4 wrapper.]),
- enable_poppler_qt4=$enableval,
- enable_poppler_qt4="try")
+AC_ARG_ENABLE(poppler-qt4,
+ AC_HELP_STRING([--disable-poppler-qt4],
+ [Don't compile poppler Qt4 wrapper.]),
+ enable_poppler_qt4=$enableval,
+ enable_poppler_qt4="try")
if test x$enable_poppler_qt4 = xyes; then
- POPPLER_FIND_QT4(POPPLER_QT4)
+ PKG_CHECK_MODULES(POPPLER_QT4,
+ QtCore >= 4.1.0 QtGui >= 4.1.0 QtXml >= 4.1.0 QtTest >= 4.1.0)
elif test x$enable_poppler_qt4 = xtry; then
- POPPLER_FIND_QT4(POPPLER_QT4,
- [enable_poppler_qt4="yes"],
- [enable_poppler_qt4="no"])
+ PKG_CHECK_MODULES(POPPLER_QT4,
+ QtCore >= 4.2.0 QtGui >= 4.1.0 QtXml >= 4.1.0 QtTest >= 4.1.0,
+ [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"
@@ -244,18 +244,6 @@
fi
AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
-if test x$enable_poppler_qt4 = xyes; then
- POPPLER_FIND_QT4TEST(POPPLER_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
-
-AM_CONDITIONAL(BUILD_POPPLER_QT4TESTS, test x$enable_poppler_qt4testlib = xyes)
-
AC_ARG_ENABLE(gtk-test,
AC_HELP_STRING([--disable-gtk-test],
[Don't compile GTK+ test program.]),
@@ -338,7 +326,6 @@
echo " cairo output: $enable_cairo_output"
echo " qt wrapper: $enable_poppler_qt"
echo " qt4 wrapper: $enable_poppler_qt4"
-echo " qt4 unittests: $enable_poppler_qt4testlib"
echo " glib wrapper: $enable_poppler_glib"
echo " use gtk-doc: $enable_gtk_doc"
echo " use libjpeg: $enable_libjpeg"
Index: poppler/Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.25
diff -u -r1.25 Makefile.am
--- poppler/Makefile.am 18 Sep 2006 15:40:50 -0000 1.25
+++ poppler/Makefile.am 1 Oct 2006 07:57:24 -0000
@@ -24,7 +24,7 @@
ArthurOutputDev.cc
arthur_includes = \
- $(POPPLER_QT4_CXXFLAGS)
+ $(POPPLER_QT4_CFLAGS)
arthur_libs = \
$(POPPLER_QT4_LIBS)
Index: qt4/src/Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- qt4/src/Makefile.am 25 Sep 2006 20:43:18 -0000 1.13
+++ qt4/src/Makefile.am 1 Oct 2006 07:57:24 -0000
@@ -2,8 +2,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
-I$(top_srcdir)/qt \
- $(FONTCONFIG_CFLAGS) \
- $(POPPLER_QT4_CXXFLAGS)
+ $(FONTCONFIG_CFLAGS) \
+ $(POPPLER_QT4_CFLAGS)
poppler_includedir = $(includedir)/poppler
Index: qt4/tests/Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt4/tests/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- qt4/tests/Makefile.am 25 Sep 2006 20:43:18 -0000 1.15
+++ qt4/tests/Makefile.am 1 Oct 2006 07:57:24 -0000
@@ -4,8 +4,7 @@
-I$(top_srcdir)/qt4/src \
-I$(top_srcdir)/qt \
$(FONTCONFIG_CFLAGS) \
- $(POPPLER_QT4_CXXFLAGS) \
- $(POPPLER_QTTEST_CXXFLAGS)
+ $(POPPLER_QT4_CFLAGS)
LDADDS = \
$(top_builddir)/poppler/libpoppler.la \
@@ -13,8 +12,6 @@
$(FONTCONFIG_LIBS) \
$(POPPLER_QT4_LIBS)
-UT_LDADDS = $(LDADDS) $(POPPLER_QTTEST_LIBS)
-
SUFFIXES: .moc
.cpp.moc:
@@ -52,7 +49,7 @@
stress_poppler_qt4_LDADD = $(LDADDS)
-if BUILD_POPPLER_QT4TESTS
+if BUILD_POPPLER_QT4
TESTS = \
check_attachments \
check_dateConversion \
@@ -66,31 +63,31 @@
check_attachments_SOURCES = check_attachments.cpp
check_attachments.$(OBJEXT): check_attachments.moc
-check_attachments_LDADD = $(UT_LDADDS)
+check_attachments_LDADD = $(LDADDS)
check_dateConversion_SOURCES = check_dateConversion.cpp
check_dateConversion.$(OBJEXT): check_dateConversion.moc
-check_dateConversion_LDADD = $(UT_LDADDS)
+check_dateConversion_LDADD = $(LDADDS)
check_fonts_SOURCES = check_fonts.cpp
check_fonts.$(OBJEXT): check_fonts.moc
-check_fonts_LDADD = $(UT_LDADDS)
+check_fonts_LDADD = $(LDADDS)
check_metadata_SOURCES = check_metadata.cpp
check_metadata.$(OBJEXT): check_metadata.moc
-check_metadata_LDADD = $(UT_LDADDS)
+check_metadata_LDADD = $(LDADDS)
check_pagemode_SOURCES = check_pagemode.cpp
check_pagemode.$(OBJEXT): check_pagemode.moc
-check_pagemode_LDADD = $(UT_LDADDS)
+check_pagemode_LDADD = $(LDADDS)
check_permissions_SOURCES = check_permissions.cpp
check_permissions.$(OBJEXT): check_permissions.moc
-check_permissions_LDADD = $(UT_LDADDS)
+check_permissions_LDADD = $(LDADDS)
check_pagelayout_SOURCES = check_pagelayout.cpp
check_pagelayout.$(OBJEXT): check_pagelayout.moc
-check_pagelayout_LDADD = $(UT_LDADDS)
+check_pagelayout_LDADD = $(LDADDS)
endif
pgpWoSh0HmnRn.pgp
Description: PGP signature
_______________________________________________ poppler mailing list poppler@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/poppler
