]> www.fi.muni.cz Git - evince.git/blobdiff - configure.ac
Check for localtime_r. See bug #339172.
[evince.git] / configure.ac
index ffb18bacbe068b14faf927bf6023b176b5a9dc5d..97ee1b1bdbae6d384e8251c9f41c5b18bba28bc0 100644 (file)
@@ -1,9 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([Evince],[2.20.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
+AC_INIT([Evince],[2.25.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 
+EV_API_VERSION=2.20
+AC_SUBST(EV_API_VERSION)
+
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -24,7 +27,6 @@ GNOME_DOC_INIT
 GNOME_MAINTAINER_MODE_DEFINES
 GNOME_COMPILE_WARNINGS
 GNOME_CXX_WARNINGS
-GNOME_DEBUG_CHECK
 
 GTK_DOC_CHECK(1.0)
 
@@ -35,7 +37,7 @@ AM_GLIB_GNU_GETTEXT
 
 dnl Check dependencies
 
-# LIB_CFLAGS       for helpers and generic widgets. (lib, cut-and-paste)
+# LIB_CFLAGS       for helpers and generic widgets. (libdocument, cut-and-paste)
 # BACKEND_CFLAGS   for backend implementations.
 # FRONTEND_CFLAGS  for frontend implementations. (properties, thumbnailer)
 # FRONTEND_LIBS
@@ -43,133 +45,108 @@ dnl Check dependencies
 # SHELL_LIBS
 
 DBUS_GLIB_REQUIRED=0.70
-GTK_REQUIRED=2.8.15
-KEYRING_REQUIRED=0.4.0
+GTK_REQUIRED=2.12.0
+GLIB_REQUIRED=2.18.0
+KEYRING_REQUIRED=2.22.0
 
-LIBGNOMEUI_REQUIRED=2.14.0
-LIBGNOME_REQUIRED=2.14.0
-LIBGNOMEPRINTUI_REQUIRED=2.6.0
 GNOME_ICON_THEME_REQUIRED=2.17.1
 LIBXML_REQUIRED=2.5.0
 
-GTK_PRINT_REQUIRED=2.10.0
+PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0 gconf-2.0)
+
+PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0)
+AC_SUBST(SMCLIENT_CFLAGS)
+AC_SUBST(SMCLIENT_LIBS)
+
+BACKEND_LIBTOOL_FLAGS="-module -avoid-version"
+AC_SUBST(BACKEND_LIBTOOL_FLAGS)
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
-PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0)
-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
+dnl ===== Check special functions
+evince_save_LIBS=$LIBS
+LIBS="$LIBS $BACKEND_LIBS"
+AC_CHECK_FUNCS(cairo_format_stride_for_width)
+LIBS=$evince_save_LIBS
 
-AC_ARG_WITH(libgnome,
-        AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]),
+AC_ARG_WITH(keyring,
+        AC_HELP_STRING([--without-keyring],[disable the use of gnome-keyring]),
        [case "${withval}" in
-       yes) WITH_GNOME=yes ;;
-       no) WITH_GNOME=no ;;
-       *) AC_MSG_ERROR(bad value ${withval} for --with-libgnome) ;;
+       yes) WITH_KEYRING=yes ;;
+       no) WITH_KEYRING=no ;;
+       *) AC_MSG_ERROR(bad value ${withval} for --with-keyring) ;;
        esac],
-       [WITH_GNOME=yes]) dnl Default value
-AM_CONDITIONAL(WITH_GNOME, test x$WITH_GNOME = "xyes")
+       [WITH_KEYRING=yes]) dnl Default value
+AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes")
 
-if test x$WITH_GNOME = "xyes"; then
-        PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED)
-        PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
-        AC_DEFINE([WITH_GNOME],[1],[Define if GNOME support is enabled])
+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
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
 
-dnl ========= Print support
-AC_ARG_WITH(print,
-           [AC_HELP_STRING([--with-print=no/gtk/gnome/auto], [Compile with print support [default=auto]])],
-           PRINT=$withval,
-            PRINT="auto")
-
-PKG_CHECK_MODULES(GNOME_PRINT, 
-                 libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED,
-                 enable_gnome_print=yes, enable_gnome_print=no)
-PKG_CHECK_MODULES(GTK_PRINT,
-                 gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED,
-                 enable_gtk_print=yes, enable_gtk_print=no)
-enable_print=no
-if test x$PRINT = xgnome -a x$enable_gnome_print = xyes; then
-   enable_print=gnome
-else
-   if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
-      enable_print=gtk
-   else
-      if test x$PRINT = xauto; then
-        if test x$enable_gtk_print = xyes; then
-           enable_print=gtk
-        else
-           if test x$enable_gnome_print = xyes; then
-              enable_print=gnome
-           fi
-        fi
-      fi
-   fi
-fi
+dnl ========= Check for DBUS
+AC_ARG_ENABLE(dbus,
+       [AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
+       enable_dbus="$enableval",enable_dbus=yes)
+if test "x$enable_dbus" != "xno"; then
+       PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
+       [enable_dbus=yes],[enable_dbus=no])
 
-if test x$enable_print = xgnome; then
-   AC_SUBST(GNOME_PRINT_CFLAGS)
-   AC_SUBST(GNOME_PRINT_LIBS)
-   AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable GNOME Print Support.])
-   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
-fi
+       if test "x$enable_dbus" = "xno"; then
+          AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
+       fi         
 
-if test x$enable_print = xgtk; then   
-   AC_SUBST(GTK_PRINT_CFLAGS)
-   AC_SUBST(GTK_PRINT_LIBS)
-   AC_DEFINE([WITH_GTK_PRINT],[1],[Enable GTK Print Support.])
-   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
-fi
-   
-AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_print = xgnome)
-AM_CONDITIONAL(WITH_GTK_PRINT, test x$enable_print = xgtk)
+       if test "x$enable_dbus" = "xyes" ; then
+               AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
 
+               if test x$DBUS_BINDING_TOOL = "xno" ; then
+                       AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
+               fi                                            
 
-dnl ========= Check for DBUS
-PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
-       [enable_dbus=yes],[enable_dbus=no])
-AC_SUBST([DBUS_CFLAGS])
-AC_SUBST([DBUS_LIBS])
-
-if test "x$enable_dbus" = "xno"; then
-       AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
+               AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+       fi
 fi
 
-if test "x$enable_dbus" = "xyes" ; then
-        AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+AC_SUBST([DBUS_CFLAGS])
+AC_SUBST([DBUS_LIBS])
 
-        if test x$DBUS_BINDING_TOOL = "xno" ; then
-               AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
-        fi                                            
+AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
+AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
 
-        AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+dnl Debug mode
+AC_ARG_ENABLE([debug],
+       AC_HELP_STRING([--enable-debug],
+                       [Turn on evince debug mode]),,
+               [enable_debug=no])
+               
+if test "x$enable_debug" = "xyes"; then
+   DEBUG_FLAGS="-DEV_ENABLE_DEBUG"
 fi
 
-LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS"
-LIB_LIBS="$LIB_LIBS $GNOME_LIBS"
+
+LIB_CFLAGS="$LIB_CFLAGS $DEBUG_FLAGS"
+LIB_LIBS="$LIB_LIBS"
 AC_SUBST(LIB_CFLAGS)
 AC_SUBST(LIB_LIBS)
 
-BACKEND_CFLAGS="$BACKEND_CFLAGS $GNOME_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-BACKEND_LIBS="$BACKEND_LIBS $GNOME_LIBS"
+BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
 AC_SUBST(BACKEND_CFLAGS)
 AC_SUBST(BACKEND_LIBS)
 
-SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $GNOMEUI_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $GNOMEUI_LIBS -lz"
+SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
+SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS -lz"
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
 
-FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS $GNOME_CFLAGS"
-FRONTEND_LIBS="$FRONTEND_CORE_LIBS $GNOME_LIBS -lz"
+FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS $DEBUG_FLAGS"
+FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
 AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LIBS)
 
-AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
-
 dnl Check for Nautilus property page build
 AC_ARG_ENABLE(nautilus,
        AC_HELP_STRING([--enable-nautilus],[compile the nautilus plugin]),
@@ -183,6 +160,8 @@ AC_ARG_ENABLE(nautilus,
 if test x$ENABLE_NAUTILUS = "xyes" ; then
        PKG_CHECK_MODULES(NAUTILUS, gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension,
                        [HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no])
+       NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+       AC_SUBST(NAUTILUS_EXTENSION_DIR)
 fi
 
 AC_SUBST(NAUTILUS_CFLAGS)
@@ -204,15 +183,6 @@ AC_ARG_ENABLE(thumbnailer,
        [ENABLE_THUMBNAILER=yes]) dnl Default value
 AM_CONDITIONAL(ENABLE_THUMBNAILER, test x$ENABLE_THUMBNAILER = "xyes")
 
-
-dnl Check for GtkRecent
-PKG_CHECK_MODULES(GTK_RECENT, gtk+-2.0 >= 2.10.0, 
-                 [HAVE_GTK_RECENT=yes], [HAVE_GTK_RECENT=no])
-if test x$HAVE_GTK_RECENT = xyes; then
-   AC_DEFINE([HAVE_GTK_RECENT], [1], [defined if GtkRecent is available])
-fi
-AM_CONDITIONAL(HAVE_GTK_RECENT, test x$HAVE_GTK_RECENT = "xyes")
-
 dnl GConf configuration
 AM_GCONF_SOURCE_2
 
@@ -235,27 +205,27 @@ 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.6
+    POPPLER_REQUIRED=0.8.0
     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
            AC_DEFINE([ENABLE_PDF], [1], [Enable pdf support.])
-           FRONTEND_LIBS="$FRONTEND_LIBS $POPPLER_LIBS"
            SHELL_LIBS="$SHELL_LIBS $POPPLER_LIBS"
            SHELL_CFLAGS="$SHELL_CFLAGS $POPPLER_CFLAGS"
 
            evince_save_LIBS=$LIBS
-           LIBS="$LIBS $FRONTEND_LIBS"
+           LIBS="$LIBS $POPPLER_LIBS"
            AC_CHECK_FUNCS(poppler_page_render)
+           AC_CHECK_FUNCS(poppler_layers_iter_new)
            LIBS=$evince_save_LIBS
 
            PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
-           if test x$enable_cairo_pdf == xyes; then
+           if test x$enable_cairo_pdf = xyes; then
                    AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
             fi
 
            PKG_CHECK_MODULES(CAIRO_PS, cairo-ps, enable_cairo_ps=yes, enable_cairo_ps=no)
-           if test x$enable_cairo_ps == xyes; then
+           if test x$enable_cairo_ps = xyes; then
                    AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available])
             fi
     else
@@ -266,35 +236,28 @@ fi
 AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes)
 dnl ================== end of pdf checks ============================================
 
-dnl ================== ggv checks ===================================================
-AC_ARG_ENABLE(ps,
-       [AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes")
-
-if test x$enable_ps = xyes; then
-       AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
-fi 
-
-AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes)
-
-if test x$enable_ps = xyes; then
-
-dnl check for GS version
-AC_MSG_CHECKING(for Ghostscript version...)
-GS_VERSION=`gs --version | head -n 1 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-AC_MSG_RESULT(found $GS_VERSION)
-if test "$GS_VERSION" -lt "7"; then
-       AC_MSG_ERROR([You need Ghostscript version >= 7 in order to run evince])
+dnl libspectre (used by ps and dvi backends)
+SPECTRE_REQUIRED=0.2.0 
+PKG_CHECK_MODULES(SPECTRE, libspectre >= $SPECTRE_REQUIRED,have_spectre=yes,have_spectre=no)
+AM_CONDITIONAL(HAVE_SPECTRE, test x$have_spectre = xyes)
+if test "x$have_spectre" = "xyes"; then
+   AC_DEFINE([HAVE_SPECTRE], [1], [Have libspectre])
 fi
 
-AC_ARG_WITH(gs-aa-params,
-            [AC_HELP_STRING([--with-gs-aa-params], [Define antialiasing params for ghostscript])],AA_PARAMS=$withval,
-           AA_PARMS="-sDEVICE=x11alpha -dNOPLATFONTS -dGraphicsAlphaBits=4 -dTextAlphaBits=4 -dDOINTERPOLATE"
-           )
-AC_DEFINE_UNQUOTED(ALPHA_PARAMS, "$AA_PARMS", [Anti-aliasing parameters for Ghostscript.])
-AC_MSG_RESULT(Antialiasing parameters for Ghostscript: $AA_PARMS)
+dnl ================== ps checks ====================================================
+AC_ARG_ENABLE(ps,
+       [AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes")
 
+if test "x$enable_ps" = "xyes"; then
+   if test "x$have_spectre" = "xyes"; then
+      AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
+   else
+      enable_ps="no"
+      AC_MSG_WARN([PS support is disabled since libspectre (version >= $SPECTRE_REQUIRED) is needed])
+   fi
 fi
-dnl ======================== End of ggv checks =================================
+AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes)
+dnl ======================== End of ps checks ===================================
 
 dnl ================== tiff checks ===================================================
 AC_ARG_ENABLE(tiff,
@@ -308,8 +271,6 @@ if test "x$enable_tiff" = "xyes"; then
     fi
     if test "x$enable_tiff" = "xyes"; then
            AC_DEFINE([ENABLE_TIFF], [1], [Enable multipage tiff support.])
-           FRONTEND_LIBS="$FRONTEND_LIBS -ltiff"
-           SHELL_LIBS="$SHELL_LIBS -ltiff"
     else
            AC_MSG_WARN("Tiff support is disabled since tiff library version 3.6 or newer not found")
     fi 
@@ -321,13 +282,11 @@ dnl ================== end of tiff checks ======================================
 dnl ================== djvu checks ===================================================
 
 AC_ARG_ENABLE(djvu,
-            [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=no)
+            [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=yes)
 
 if test "x$enable_djvu" = "xyes"; then
-
-DJVULIBRE_REQUIRED=3.5.17
-
-PKG_CHECK_MODULES(DJVU, ddjvuapi >= $DJVULIBRE_REQUIRED, enable_djvu=yes, enable_djvu=no)
+    DJVULIBRE_REQUIRED=3.5.17
+    PKG_CHECK_MODULES(DJVU, ddjvuapi >= $DJVULIBRE_REQUIRED, enable_djvu=yes, enable_djvu=no)
 
     if test "x$enable_djvu" = "xyes"; then
         AC_DEFINE([ENABLE_DJVU], [1], [Enable djvu viewer support.])
@@ -347,7 +306,7 @@ dnl ================== End of djvu checks ======================================
 dnl ================== dvi checks ===================================================
 
 AC_ARG_ENABLE(dvi,
-            [AC_HELP_STRING([--enable-dvi], [Compile with support of dvi viewer])],enable_dvi="$enableval",enable_dvi=no)
+            [AC_HELP_STRING([--enable-dvi], [Compile with support of dvi viewer])],enable_dvi="$enableval",enable_dvi=yes)
 
 AC_ARG_ENABLE(t1lib,
             [AC_HELP_STRING([--enable-t1lib], [Compile with support of t1lib for type1 fonts in dvi])],enable_type1_fonts="$enableval",enable_type1_fonts=no)
@@ -399,7 +358,7 @@ dnl ================== End of pixbuf checks ====================================
 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=no)
+       [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.])
 fi 
@@ -427,7 +386,7 @@ if test "x$enable_ps" = "xyes" ; then
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;"
 fi
 if test "x$enable_dvi" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-dvi;"
+       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-dvi;application/x-bzdvi;application/x-gzdvi;"
 fi
 if test "x$enable_djvu" = "xyes"; then
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/vnd.djvu;"
@@ -436,7 +395,7 @@ if test "x$enable_tiff" = "xyes"; then
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;"
 fi
 if test "x$enable_comics" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;"
+       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
@@ -446,6 +405,8 @@ if test "x$enable_impress" = "xyes"; then
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
+AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
+
 AC_CONFIG_FILES([
 backend/Makefile
 backend/comics/Makefile
@@ -458,7 +419,10 @@ backend/pixbuf/Makefile
 backend/ps/Makefile
 backend/tiff/Makefile
 cut-n-paste/Makefile
-cut-n-paste/recent-files/Makefile
+cut-n-paste/evmountoperation/Makefile
+cut-n-paste/gedit-message-area/Makefile
+cut-n-paste/gimpcellrenderertoggle/Makefile
+cut-n-paste/smclient/Makefile
 cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
 cut-n-paste/totem-screensaver/Makefile
@@ -497,12 +461,12 @@ AC_OUTPUT
 
 echo "
 Configure summary:
-       GNOME Support......:  $WITH_GNOME
-       Print Support......:  $enable_print
+       Keyring Support....:  $WITH_KEYRING
        DBUS Support.......:  $enable_dbus
        Nautilus Plugin....:  $HAVE_NAUTILUS
        Thumbnailer........:  $ENABLE_THUMBNAILER
        Gtk-Doc Support....:  $enable_gtk_doc
+       Debug mode.........:  $enable_debug
 
        PDF Backend........:  $enable_pdf
        PostScript Backend.:  $enable_ps