X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=821c52bc569bab17e4db3433c4989e12a9c70d36;hb=466a2b3ce0c1cfa49b504704f3ec20c65140310f;hp=1b2e526bb4da0b86906308b789619f697a3a3b80;hpb=2e03795ad56b30b8ca05bb843ba728a9c65ec61f;p=evince.git

diff --git a/configure.ac b/configure.ac
index 1b2e526b..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],[3])
+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
@@ -284,6 +286,8 @@ if test "$with_gconf" = "yes"; then
    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
@@ -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