X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=3e477e59e2ce37df9f194695be866626e358198f;hb=c24535f0f7164b69d309eb62c36b020568c7e4bd;hp=eee407e4d0aead66e610b83743735e8bfe52369f;hpb=a0f9ec3d4c28ed79363aaeb32395c3e026d1cb18;p=evince.git

diff --git a/configure.ac b/configure.ac
index eee407e4..3e477e59 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],[4])
+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])
 
@@ -61,7 +61,8 @@ AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_STDC_HEADERS
-IT_PROG_INTLTOOL([0.35.0])
+
+AC_PROG_SED
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
@@ -73,11 +74,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])
@@ -113,7 +120,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])
@@ -263,6 +270,10 @@ AC_SUBST([DBUS_LIBS])
 
 AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
 
+if test "$enable_dbus" = "yes"; then
+   PKG_CHECK_MODULES([EV_DAEMON], [gthread-2.0 gio-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
+fi
+
 dnl ========= Check for GConf
 
 AC_MSG_CHECKING([whether GConf support is requested])
@@ -302,6 +313,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"
@@ -327,6 +344,10 @@ FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
 AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LIBS)
 
+EV_DAEMON_CFLAGS="$EV_DAEMON_CFLAGS $DEBUG_FLAGS"
+AC_SUBST([EV_DAEMON_CFLAGS])
+AC_SUBST([EV_DAEMON_LIBS])
+
 # Check for Nautilus property page build
 AC_ARG_ENABLE([nautilus],
   [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])],
@@ -675,7 +696,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
@@ -740,6 +761,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