X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=c0304ec156c1879d9e662b906a9266a8438ef9a0;hb=d59576191a18f442ef65b9ff7ec61449f4329257;hp=ee8b971a2ff6689910c6e99498cbff76dd72a8e9;hpb=c2ce718b57e24a8251befa805a1ee6c2fbca85ec;p=evince.git diff --git a/configure.ac b/configure.ac index ee8b971a..c0304ec1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,13 @@ # ***************************************************************************** m4_define([ev_major_version],[2]) -m4_define([ev_minor_version],[27]) -m4_define([ev_micro_version],[90]) +m4_define([ev_minor_version],[29]) +m4_define([ev_micro_version],[1]) m4_define([ev_extra_version],[]) m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) # The evince API version -m4_define([ev_api_version], [2.25]) +m4_define([ev_api_version], [2.29]) # Libtool versioning. The backend and view libraries have separate versions. # Before making a release, the libtool version should be modified. @@ -21,14 +21,14 @@ m4_define([ev_api_version], [2.25]) # - If the interface is the same as the previous version, change to C:R+1:A # Libtool version of the backend library -m4_define([ev_document_lt_current],[1]) +m4_define([ev_document_lt_current],[2]) m4_define([ev_document_lt_revision],[0]) m4_define([ev_document_lt_age],[0]) m4_define([ev_document_lt_version_info],[ev_document_lt_current:ev_document_lt_revision:ev_document_lt_age]) m4_define([ev_document_lt_current_minus_age],[m4_eval(ev_document_lt_current - ev_document_lt_age)]) # Libtool version of the view library -m4_define([ev_view_lt_current],[1]) +m4_define([ev_view_lt_current],[2]) m4_define([ev_view_lt_revision],[0]) m4_define([ev_view_lt_age],[0]) m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age]) @@ -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]) @@ -154,14 +161,13 @@ PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_ GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" -SMCLIENT_PKGS= AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])], [], [case "$GDK_TARGET" in x11) case "$with_platform" in - gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;; + gnome) with_smclient=xsmp ;; *) with_smclient=no ;; esac ;; win32|quartz) with_smclient=$GDK_TARGET ;; @@ -172,6 +178,11 @@ AC_MSG_RESULT([$with_smclient]) 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" ;; + *) SMCLIENT_PKGS="" ;; + esac + PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS]) AC_SUBST([SMCLIENT_CFLAGS]) AC_SUBST([SMCLIENT_LIBS]) @@ -263,6 +274,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 +317,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 +348,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])], @@ -432,7 +457,7 @@ AC_ARG_ENABLE(pdf, [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes) if test "x$enable_pdf" = "xyes"; then - POPPLER_REQUIRED=0.11.0 + POPPLER_REQUIRED=0.12.0 PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no) if test "x$enable_pdf" = "xyes"; then @@ -675,7 +700,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 +765,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