X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=821c52bc569bab17e4db3433c4989e12a9c70d36;hb=cc3f21efc8104182171c9300facc16d9a79177ef;hp=4ffa56a71402f4a9649b81d990bbba40eb35dd22;hpb=59b1b2c33a2d03ba81282169f01a6c1d0a3226a5;p=evince.git

diff --git a/configure.ac b/configure.ac
index 4ffa56a7..821c52bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 m4_define([ev_major_version],[2])
 m4_define([ev_minor_version],[27])
-m4_define([ev_micro_version],[1])
+m4_define([ev_micro_version],[4])
 m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -51,6 +51,8 @@ if test -z "$enable_maintainer_mode"; then
 fi
 AM_MAINTAINER_MODE([enable])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 AM_PROG_LIBTOOL
 
 AC_ISC_POSIX
@@ -107,8 +109,7 @@ if test "$with_platform" = "win32"; then
 fi
 
 AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
-AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"])
-AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
+AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 dnl Specify required versions of dependencies
 DBUS_GLIB_REQUIRED=0.70
@@ -278,13 +279,15 @@ 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])
-fi
 
-AM_GCONF_SOURCE_2
+   AM_GCONF_SOURCE_2
 
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
-if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then
-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   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
@@ -325,7 +328,7 @@ AC_SUBST(FRONTEND_LIBS)
 
 # Check for Nautilus property page build
 AC_ARG_ENABLE([nautilus],
-  [AS_HELP_STRING([--enable-nautilus],[compile the nautilus plugin])],
+  [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])],
   [],
   [case "$with_platform" in
      gnome) enable_nautilus=yes ;;
@@ -333,7 +336,8 @@ AC_ARG_ENABLE([nautilus],
     esac])
 
 if test "$enable_nautilus" = "yes" ; then
-  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension])
+  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension],
+                    [],[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])
   AC_SUBST(NAUTILUS_CFLAGS)
@@ -658,8 +662,6 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
 
 # *****************************************************************************
 
-SHAVE_INIT([], [enable])
-
 AC_CONFIG_FILES([
 backend/Makefile
 backend/comics/Makefile
@@ -713,8 +715,6 @@ Makefile
 po/Makefile.in
 previewer/Makefile
 properties/Makefile
-shave
-shave-libtool
 shell/Makefile
 test/Makefile
 thumbnailer/Makefile