X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=ca89c277297fe28546981b2ca9296e509499735e;hb=62f49fb645c00fd0ab52588a70cec76019e04afa;hp=ce7eedc772c69ac3a934f6e5d9c263779664bc9e;hpb=a01fab9d01d6bd9fe2b479cbcbc7ee5fe7d69515;p=evince.git

diff --git a/configure.ac b/configure.ac
index ce7eedc7..ca89c277 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])
 
@@ -44,6 +44,7 @@ AC_INIT([Evince],[ev_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=e
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR(m4)
 
 AM_MAINTAINER_MODE
 
@@ -133,7 +134,7 @@ fi
 AC_SUBST(SMCLIENT_CFLAGS)
 AC_SUBST(SMCLIENT_LIBS)
 
-BACKEND_LIBTOOL_FLAGS="-module -avoid-version -export-symbols \$(top_srcdir)/backend/backend.symbols"
+BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols"
 AC_SUBST(BACKEND_LIBTOOL_FLAGS)
 
 dnl ===== Check special functions
@@ -150,13 +151,23 @@ AC_ARG_WITH(keyring,
 	no) WITH_KEYRING=no ;;
 	*) AC_MSG_ERROR(bad value ${withval} for --with-keyring) ;;
 	esac],
-	[WITH_KEYRING=yes]) dnl Default value
-AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes")
-
+	[WITH_KEYRING=check]) dnl Default value
+
+if test x$WITH_KEYRING != "xno"; then
+	PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $KEYRING_REQUIRED,
+		WITH_KEYRING=yes,
+		if test "x$WITH_KEYRING" = "xcheck"; then
+			WITH_KEYRING=no
+			AC_MSG_WARN(The use of gnome-keyring is disabled since required library gnome-keyring-1 >= $KEYRING_REQUIRED was not found.)
+		else
+			AC_MSG_FAILURE(Gnome-keyring test failed: $KEYRING_PKG_ERRORS)
+		fi
+	)
+fi
 if test x$WITH_KEYRING = "xyes"; then
-        PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $KEYRING_REQUIRED)
         AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
 fi
+AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes")
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
@@ -191,22 +202,38 @@ AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
 AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
 
 dnl ========= Check for GConf
-AC_ARG_WITH(gconf,
-	AC_HELP_STRING([--without-gconf],[disable the use of gconf]),
-	[case "${withval}" in
-	yes) WITH_GCONF=yes ;;
-	no) WITH_GCONF=no ;;
-	*) AC_MSG_ERROR(bad value ${withval} for --with-gconf) ;;
-	esac],
-	[WITH_GCONF=yes]) dnl Default value
-AM_CONDITIONAL(WITH_GCONF, test x$WITH_GCONF = "xyes")
 
-if test x$WITH_GCONF = "xyes"; then
-   PKG_CHECK_MODULES(GCONF, gconf-2.0)
-   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+AC_MSG_CHECKING([whether GConf support is requested])
+AC_ARG_WITH([gconf],
+  [AS_HELP_STRING([--without-gconf],[disable the use of gconf])],
+  [],[with_gconf=check])
+AC_MSG_RESULT([$with_gconf])
+
+if test "x$with_gconf" != "xno"; then
+	PKG_CHECK_MODULES([GCONF],[gconf-2.0],
+		with_gconf=yes,
+		if test "x$with_gconf" = "xcheck"; then
+			with_gconf=no
+			AC_MSG_WARN(The use of GConf is disabled since required library gconf-2.0 was not found.)
+		else
+			AC_MSG_FAILURE(GConf test failed: $GCONF_PKG_ERRORS)
+		fi
+	)
+fi
+if test "x$with_gconf" = "xyes"; then
+	AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+fi
+AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
+
+AM_GCONF_SOURCE_2
+
+AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
+if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then
+  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
 fi
 
 dnl Debug mode
+
 AC_ARG_ENABLE([debug],
 	AC_HELP_STRING([--enable-debug],
 			[Turn on evince debug mode]),,
@@ -299,14 +326,6 @@ PREVIEWER_LIBS="$PREVIEWER_LIBS -lz"
 AC_SUBST(PREVIEWER_CFLAGS)
 AC_SUBST(PREVIEWER_LIBS)
 
-dnl GConf configuration
-AM_GCONF_SOURCE_2
-
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-if test "x$GCONFTOOL" = "xno"; then
-	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
 # ***
 # GIR
 # ***
@@ -356,8 +375,8 @@ AC_ARG_ENABLE(pdf,
               [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes)
 
 if test "x$enable_pdf" = "xyes"; then
-    POPPLER_REQUIRED=0.8.0
-    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
+    POPPLER_REQUIRED=0.11.0
+    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.])
@@ -367,7 +386,7 @@ if test "x$enable_pdf" = "xyes"; then
 	    evince_save_LIBS=$LIBS
 	    LIBS="$LIBS $POPPLER_LIBS"
 	    AC_CHECK_FUNCS(poppler_page_render)
-	    AC_CHECK_FUNCS(poppler_layers_iter_new)
+	    AC_CHECK_FUNCS(poppler_page_get_image)
 	    LIBS=$evince_save_LIBS
 
 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
@@ -511,7 +530,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)
 
@@ -578,6 +605,8 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
 
 # *****************************************************************************
 
+SHAVE_INIT([.], [enable])
+
 AC_CONFIG_FILES([
 backend/Makefile
 backend/comics/Makefile
@@ -631,6 +660,8 @@ Makefile
 po/Makefile.in
 previewer/Makefile
 properties/Makefile
+shave
+shave-libtool
 shell/Makefile
 test/Makefile
 thumbnailer/Makefile
@@ -643,7 +674,7 @@ AC_OUTPUT
 
 echo "
 Configure summary:
-        GConf Support......:  $WITH_GCONF
+        GConf Support......:  $with_gconf
 	Keyring Support....:  $WITH_KEYRING
 	DBUS Support.......:  $enable_dbus
 	Nautilus Plugin....:  $HAVE_NAUTILUS