[build] Only fail on missing gnome-keyring when requested explicitly

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 88628b5757020651831f0697cfaefd41c225fadd..ca89c277297fe28546981b2ca9296e509499735e 100644 (file)
--- 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
 
@@ -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)
@@ -195,15 +206,24 @@ dnl ========= Check for GConf
 AC_MSG_CHECKING([whether GConf support is requested])
 AC_ARG_WITH([gconf],
   [AS_HELP_STRING([--without-gconf],[disable the use of gconf])],
-  [],[with_gconf=yes])
+  [],[with_gconf=check])
 AC_MSG_RESULT([$with_gconf])
 
-AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
-
-if test "$with_gconf" = "yes"; then
-   PKG_CHECK_MODULES([GCONF],[gconf-2.0])
-   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+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
 
@@ -356,7 +376,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.])
@@ -366,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)
@@ -510,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)
 
@@ -577,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
@@ -630,6 +660,8 @@ Makefile
 po/Makefile.in
 previewer/Makefile
 properties/Makefile
+shave
+shave-libtool
 shell/Makefile
 test/Makefile
 thumbnailer/Makefile