X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=6208b0c718cda84796c06681275762f8fcd8a4ad;hb=5f88485c248926a48031eb6dd94dfaa89204a810;hp=1b2e526bb4da0b86906308b789619f697a3a3b80;hpb=2e03795ad56b30b8ca05bb843ba728a9c65ec61f;p=evince.git

diff --git a/configure.ac b/configure.ac
index 1b2e526b..6208b0c7 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],[90])
 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
@@ -59,7 +61,7 @@ AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_STDC_HEADERS
-IT_PROG_INTLTOOL([0.35.0])
+
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
@@ -71,11 +73,17 @@ GNOME_CXX_WARNINGS
 
 GTK_DOC_CHECK(1.0)
 
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=evince
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
 AM_GLIB_GNU_GETTEXT
 
+m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
+EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend:   %.evince-backend.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE])
+
 # Check which platform to use
 
 AC_MSG_CHECKING([for which platform to build])
@@ -111,7 +119,7 @@ AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 dnl Specify required versions of dependencies
 DBUS_GLIB_REQUIRED=0.70
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.14.0
 GLIB_REQUIRED=2.18.0
 KEYRING_REQUIRED=2.22.0
 AC_SUBST([GLIB_REQUIRED])
@@ -189,6 +197,7 @@ dnl ===== Check special functions
 evince_save_LIBS=$LIBS
 LIBS="$LIBS $BACKEND_LIBS"
 AC_CHECK_FUNCS(cairo_format_stride_for_width)
+AC_CHECK_FUNCS(gtk_print_operation_get_n_pages_to_print)
 LIBS=$evince_save_LIBS
 
 # ******************
@@ -284,6 +293,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
@@ -297,6 +308,12 @@ if test "x$enable_debug" = "xyes"; then
    DEBUG_FLAGS="-DEV_ENABLE_DEBUG"
 fi
 
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--enable-tests], [Disable tests]),
+	enable_tests="$enableval",
+	enable_tests=yes)
+
+AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
 
 LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS"
 LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS"
@@ -658,8 +675,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
@@ -672,7 +687,7 @@ backend/pixbuf/Makefile
 backend/ps/Makefile
 backend/tiff/Makefile
 cut-n-paste/Makefile
-cut-n-paste/gedit-message-area/Makefile
+cut-n-paste/evinfobar/Makefile
 cut-n-paste/gimpcellrenderertoggle/Makefile
 cut-n-paste/smclient/Makefile
 cut-n-paste/toolbar-editor/Makefile
@@ -713,8 +728,6 @@ Makefile
 po/Makefile.in
 previewer/Makefile
 properties/Makefile
-shave
-shave-libtool
 shell/Makefile
 test/Makefile
 thumbnailer/Makefile
@@ -739,6 +752,7 @@ Configure summary:
 	Gtk-Doc Support....:  $enable_gtk_doc
 	Debug mode.........:  $enable_debug
 	GObj. Introspection:  $enable_introspection
+	Tests..............:  $enable_tests
 
 	PDF Backend........:  $enable_pdf
 	PostScript Backend.:  $enable_ps