X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=88ed566226dcd1edf746dbf8910a26a43f1edce5;hb=a38950d990d49b5383c7b26fc89f11985af73408;hp=04bc517b2b2423be38e91337cc7a876cd57dac9a;hpb=b20dd164ff2a12342bcfbaffbe3fec41e05fa001;p=evince.git diff --git a/configure.ac b/configure.ac index 04bc517b..88ed5662 100644 --- a/configure.ac +++ b/configure.ac @@ -43,10 +43,11 @@ dnl Check dependencies POPPLER_REQUIRED=0.5.1 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 -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) @@ -137,16 +138,6 @@ if test x$HAVE_NAUTILUS = "xyes"; then 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 @@ -221,7 +212,7 @@ if test "x$enable_djvu" = "xyes"; then DJVULIBRE_REQUIRED=3.5.17 -PKG_CHECK_MODULES(DJVU, ddjvuapi >= 3.5.17, enable_djvu=yes, enable_djvu=no) +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.])