Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv5100
Modified Files:
ChangeLog configure.ac
Log Message:
* configure.ac: Disable qt and qt4 frontends if splash backend is
disabled
Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -d -r1.405 -r1.406
--- ChangeLog 28 Jul 2006 18:17:45 -0000 1.405
+++ ChangeLog 29 Jul 2006 16:22:52 -0000 1.406
@@ -1,3 +1,8 @@
+2006-07-29 Albert Astals Cid <[EMAIL PROTECTED]>
+
+ * configure.ac: Disable qt and qt4 frontends if splash backend is
+ disabled
+
2006-07-28 Kristian Høgsberg <[EMAIL PROTECTED]>
* poppler/CairoOutputDev.cc: Don't set font matrix translation
Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- configure.ac 24 Jul 2006 19:49:51 -0000 1.55
+++ configure.ac 29 Jul 2006 16:22:52 -0000 1.56
@@ -224,7 +224,12 @@
fi
AC_SUBST(POPPLER_QT_CXXFLAGS)
AC_SUBST(POPPLER_QT_LIBS)
-AM_CONDITIONAL(BUILD_POPPLER_QT, test x$enable_poppler_qt = xyes)
+if test x$enable_splash_output != xyes; then
+ if test x$enable_poppler_qt = xyes; then
+ enable_poppler_qt="no because of disabled splash"
+ fi
+fi
+AM_CONDITIONAL(BUILD_POPPLER_QT, test "x$enable_poppler_qt" = "xyes")
dnl
dnl Try Qt4
@@ -245,7 +250,12 @@
AC_SUBST(POPPLER_QT4_CXXFLAGS)
AC_SUBST(POPPLER_QT4_LIBS)
-AM_CONDITIONAL(BUILD_POPPLER_QT4, test x$enable_poppler_qt4 = xyes)
+if test x$enable_splash_output != xyes; then
+ if test x$enable_poppler_qt4 = xyes; then
+ enable_poppler_qt4="no because of disabled splash"
+ fi
+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,
@@ -290,8 +300,8 @@
enable_compile_warnings=no
fi
case "$enable_compile_warnings" in
- no) ;;
- yes) CXXFLAGS="-Wall -Wno-unused $CXXFLAGS" ;;
+ no) CXXFLAGS="-Wl,--no-undefined $CXXFLAGS" ;;
+ yes) CXXFLAGS="-Wall -Wno-unused -Wl,--no-undefined $CXXFLAGS" ;;
kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \
-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \
-Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
