56 lines
1.8 KiB
Plaintext
56 lines
1.8 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.2 2011/12/10 22:04:12 kili Exp $
|
|
--- configure.ac.orig Sun Dec 4 15:43:49 2011
|
|
+++ configure.ac Fri Dec 9 21:26:12 2011
|
|
@@ -444,6 +444,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
|
|
|
|
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
|
|
|
+AC_ARG_ENABLE(poppler-qt,
|
|
+ AC_HELP_STRING([--disable-poppler-qt],
|
|
+ [Don't compile poppler qt wrapper.]),
|
|
+ enable_poppler_qt=$enableval,
|
|
+ enable_poppler_qt="try")
|
|
+
|
|
+if test x$enable_poppler_qt = xyes; then
|
|
+ POPPLER_FIND_QT(POPPLER_QT,,)
|
|
+elif test x$enable_poppler_qt = xtry; then
|
|
+ POPPLER_FIND_QT(POPPLER_QT,
|
|
+ [enable_poppler_qt="yes"],
|
|
+ [enable_poppler_qt="no"])
|
|
+fi
|
|
+AC_SUBST(POPPLER_QT_CXXFLAGS)
|
|
+AC_SUBST(POPPLER_QT_LIBS)
|
|
+
|
|
+AM_CONDITIONAL(BUILD_POPPLER_QT, test "x$enable_poppler_qt" = "xyes")
|
|
+
|
|
dnl
|
|
dnl Try Qt4
|
|
dnl
|
|
@@ -477,7 +495,7 @@ AC_SUBST(POPPLER_QT4_TEST_LIBS)
|
|
|
|
if test x$enable_poppler_qt4 = xyes; then
|
|
AC_MSG_CHECKING([for Qt4 moc])
|
|
- MOCQT4=`which moc`
|
|
+ MOCQT4=`which moc4`
|
|
mocversion=`$MOCQT4 -v 2>&1`
|
|
mocversiongrep=`echo $mocversion | grep "Qt 4"`
|
|
if test x"$mocversiongrep" != x"$mocversion"; then
|
|
@@ -606,6 +624,9 @@ glib/reference/Makefile
|
|
glib/reference/version.xml
|
|
glib/demo/Makefile
|
|
test/Makefile
|
|
+poppler-qt.pc
|
|
+poppler-qt-uninstalled.pc
|
|
+qt/Makefile
|
|
qt4/Makefile
|
|
qt4/src/Makefile
|
|
qt4/tests/Makefile
|
|
@@ -632,6 +653,7 @@ echo "Building poppler with support for:"
|
|
echo " font configuration: $with_font_configuration"
|
|
echo " splash output: $enable_splash_output"
|
|
echo " cairo output: $enable_cairo_output"
|
|
+echo " qt wrapper: $enable_poppler_qt"
|
|
echo " qt4 wrapper: $enable_poppler_qt4"
|
|
echo " glib wrapper: $enable_poppler_glib"
|
|
echo " introspection: $found_introspection"
|