*** empty log message ***

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b3a1a8bfd52a889dac78cf43e95b4e858df2e575..2558bd85bd922cae46c1f01aba1bf9ed1bc51279 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)
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)

-AC_INIT(evince, 0.5.2)
+AC_INIT(evince, 0.5.3)

 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_CONFIG_HEADER(config.h)


@@ -15,7 +15,7 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_CXX
 AC_STDC_HEADERS
 AM_PROG_CC_STDC
 AC_PROG_CXX
 AC_STDC_HEADERS

-IT_PROG_INTLTOOL([0.34.90])
+IT_PROG_INTLTOOL([0.35.0])

 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 


@@ -41,12 +41,13 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 

-POPPLER_REQUIRED=0.5.1
+POPPLER_REQUIRED=0.5.2

 DBUS_GLIB_REQUIRED=0.33
 DBUS_GLIB_REQUIRED=0.33

-GTK_REQUIRED=2.6.0
-LIBGNOMEUI_REQUIRED=2.6.0
+GTK_REQUIRED=2.8.15

 KEYRING_REQUIRED=0.4.0
 KEYRING_REQUIRED=0.4.0

-LIBGNOMEPRINTUI_REQUIRED=2.5.1
+
+LIBGNOMEUI_REQUIRED=2.14.0
+LIBGNOMEPRINTUI_REQUIRED=2.6.0

 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)


@@ -137,16 +138,6 @@ if test x$HAVE_NAUTILUS = "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
 
 fi
 AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
 

-dnl Check for functions not present in gtk 2.6
-evince_save_LIBS=$LIBS
-LIBS="$LIBS $FRONTEND_CORE_LIBS"
-AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
-AC_CHECK_FUNCS(gtk_window_present_with_time)
-AC_CHECK_FUNCS(g_file_set_contents)
-AC_CHECK_FUNCS(gtk_file_chooser_set_do_overwrite_confirmation)
-AC_CHECK_FUNCS(gtk_icon_view_enable_model_drag_source)
-LIBS=$evince_save_LIBS
-

 dnl GConf configuration
 AM_GCONF_SOURCE_2
 
 dnl GConf configuration
 AM_GCONF_SOURCE_2
 


@@ -218,20 +209,17 @@ AC_ARG_ENABLE(djvu,
             [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=no)
 
 if test "x$enable_djvu" = "xyes"; then
             [AC_HELP_STRING([--enable-djvu], [Compile with support of djvu viewer])],enable_djvu="$enableval",enable_djvu=no)
 
 if test "x$enable_djvu" = "xyes"; then

-    AC_CHECK_HEADERS([libdjvu/ddjvuapi.h],enable_djvu=yes,enable_djvu=no,)

 
 

-    if test "x$enable_djvu" = "xyes"; then
-       AC_CHECK_LIB([djvulibre],ddjvu_context_create,enable_djvu=yes,enable_djvu=no,"-lpthread")
-       AC_CHECK_LIB([djvulibre],ddjvu_document_get_pageinfo,enable_djvu=yes,enable_djvu=no,"-lpthread")
-       AC_CHECK_LIB([djvulibre],ddjvu_document_get_pagetext,enable_djvu=yes,enable_djvu=no,"-lpthread")
-    fi
+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.])
     else
        AC_MSG_WARN([   
 ** Djvu support is disabled since a recent version of the djvulibre 
 
     if test "x$enable_djvu" = "xyes"; then
         AC_DEFINE([ENABLE_DJVU], [1], [Enable djvu viewer support.])
     else
        AC_MSG_WARN([   
 ** Djvu support is disabled since a recent version of the djvulibre 

-** library was not found. You need at least djvulibre-3.5.16 which 
+** library was not found. You need at least djvulibre-3.5.17 which 

 ** can be found on http://djvulibre.djvuzone.org 
 ])
     fi 
 ** can be found on http://djvulibre.djvuzone.org 
 ])
     fi