X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=d1f1ed7e6587c82862fff4b215d3352ffa76a735;hb=d436fe08f53a60b50f70f8c7563edb019007f98f;hp=099c3a51ca2c05feb8e7585ed8ecc91fbd607411;hpb=07330833c7e90d6b82f4dca2d4840547a25afe4c;p=evince.git

diff --git a/configure.ac b/configure.ac
index 099c3a51..d1f1ed7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # *****************************************************************************
 
 m4_define([ev_major_version],[2])
-m4_define([ev_minor_version],[26])
-m4_define([ev_micro_version],[0])
+m4_define([ev_minor_version],[27])
+m4_define([ev_micro_version],[1])
 m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -357,7 +357,7 @@ AC_ARG_ENABLE(pdf,
 
 if test "x$enable_pdf" = "xyes"; then
     POPPLER_REQUIRED=0.11.0
-    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
+    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
 	    AC_DEFINE([ENABLE_PDF], [1], [Enable pdf support.])
@@ -511,7 +511,15 @@ dnl ================== comic book checks =======================================
 AC_ARG_ENABLE(comics,
  	[AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics="$enableval",enable_comics=yes)
 if test "x$enable_comics" = "xyes"; then
-	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
+	if test "x$os_win32" = "xyes"; then
+		# The comics backend is disabled on windows because:
+		# 1) it uses unix functions from sys/wait.h.
+		# 2) it uses external decompression tools not generally available on windows.
+		enable_comics=no
+		AC_MSG_WARN(The comics backend is not supported on windows.)
+	else
+		AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
+	fi
 fi 
 AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)