Add compressed dvi to the list of supported mime types. Patch by Ed

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b94d9a89c049c16d3649d09bbe228d6a74d90858..934211392041055eed38ec82d6bbea1e3f45e5b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([Evince],[2.21.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
+AC_INIT([Evince],[2.22.0],[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
@@ -47,7 +47,7 @@ dnl Check dependencies
 
 DBUS_GLIB_REQUIRED=0.70
 GTK_REQUIRED=2.10.0
-GLIB_REQUIRED=2.15.4
+GLIB_REQUIRED=2.15.6
 KEYRING_REQUIRED=0.4.0
 
 LIBGNOMEUI_REQUIRED=2.14.0
@@ -104,25 +104,31 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
 dnl ========= Check for DBUS
-PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
+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])
-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])
-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_dbus" = "xyes" ; then
-        AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+       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                                            
+               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                                            
 
-        AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+               AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+       fi
 fi
 
+AC_SUBST([DBUS_CFLAGS])
+AC_SUBST([DBUS_LIBS])
+
 LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS"
 LIB_LIBS="$LIB_LIBS $GNOME_LIBS"
 AC_SUBST(LIB_CFLAGS)
@@ -218,6 +224,15 @@ if test "x$enable_pdf" = "xyes"; then
            AC_CHECK_FUNCS(poppler_page_get_image)
            LIBS=$evince_save_LIBS
 
+           POPPLER_MAJOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\?/\1/'`
+           POPPLER_MINOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\?/\3/'`
+           if test -z "$POPPLER_MINOR_VERSION"; then
+             POPPLER_MINOR_VERSION=0
+           fi
+
+           AC_DEFINE_UNQUOTED([POPPLER_MAJOR_VERSION], $POPPLER_MAJOR_VERSION, [Poppler major version number])
+           AC_DEFINE_UNQUOTED([POPPLER_MINOR_VERSION], $POPPLER_MINOR_VERSION, [Poppler minor version number])
+
            PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
            if test x$enable_cairo_pdf == xyes; then
                    AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
@@ -402,7 +417,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;"