X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=e5924c9416c6342d3c0822f586a968968f16a006;hb=HEAD;hp=afd863fd035ff2d935761654f4e1e5dd30da6a5a;hpb=e214c8e963fc4224c5ee54b8b9f0d23cb07019d7;p=evince.git

diff --git a/configure.ac b/configure.ac
index afd863fd..e5924c94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
 # Versioning
 # *****************************************************************************
 
-m4_define([ev_major_version],[2])
-m4_define([ev_minor_version],[91])
-m4_define([ev_micro_version],[4])
+m4_define([ev_major_version],[3])
+m4_define([ev_minor_version],[0])
+m4_define([ev_micro_version],[0])
 m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -125,7 +125,8 @@ dnl Specify required versions of dependencies
 CAIRO_REQUIRED=1.10.0
 GLIB_REQUIRED=2.25.11
 KEYRING_REQUIRED=2.22.0
-GTK_REQUIRED=2.91.7
+GTK_REQUIRED=3.0.2
+NAUTILUS_REQUIRED=2.91.4
 
 AC_SUBST([GLIB_REQUIRED])
 AC_SUBST([GTK_REQUIRED])
@@ -200,7 +201,7 @@ if test "$with_smclient" != "no"; then
   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
 
   case "$with_smclient" in
-    xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
+    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
     *) SMCLIENT_PKGS="" ;;
   esac
 
@@ -292,35 +293,6 @@ if test x$has_desktop_schemas = xyes; then
    AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available])
 fi
 
-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])],
-  [],
-  [case "$os_win32" in
-     yes) with_gconf=no ;;
-     *) with_gconf=yes ;;
-   esac])
-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])
-
-   AM_GCONF_SOURCE_2
-
-   AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
-   if test "$GCONFTOOL" = "false"; then
-      AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-   fi
-else
-   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false)
-fi
-
 dnl Debug mode
 
 AC_ARG_ENABLE([debug],
@@ -380,7 +352,7 @@ AC_ARG_ENABLE([nautilus],
     esac])
 
 if test "$enable_nautilus" = "yes" ; then
-  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension],
+  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
                     [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
   AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
@@ -794,8 +766,9 @@ data/icons/32x32/mimetypes/Makefile
 data/icons/48x48/Makefile
 data/icons/48x48/apps/Makefile
 data/icons/48x48/actions/Makefile
+data/icons/256x256/Makefile
+data/icons/256x256/apps/Makefile
 data/icons/scalable/Makefile
-data/icons/scalable/apps/Makefile
 data/icons/scalable/actions/Makefile
 data/icons/scalable/mimetypes/Makefile
 help/Makefile
@@ -827,7 +800,6 @@ AC_OUTPUT
 echo "
 Configure summary:
         Platform...........:  $with_platform
-        GConf Support......:  $with_gconf
 	GTK+ Unix Print....:  $with_gtk_unix_print
 	Keyring Support....:  $with_keyring
 	DBUS Support.......:  $enable_dbus