X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=61a7ff8e6338e507fdc34a97963afd29c2520517;hb=a5231a61a0f44d710d7f69c9c3e404f09569f0b7;hp=3afd4df3705e79e0f7d3392be042a3ccf4f95e0a;hpb=9e9030158c23c785c3d3f26cde7971137fb64803;p=evince.git diff --git a/configure.ac b/configure.ac index 3afd4df3..61a7ff8e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,12 +4,12 @@ m4_define([ev_major_version],[2]) m4_define([ev_minor_version],[31]) -m4_define([ev_micro_version],[90]) +m4_define([ev_micro_version],[92]) 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.30]) +m4_define([ev_api_version], [2.32]) # 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.30]) # - 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],[2]) +m4_define([ev_document_lt_current],[3]) 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],[2]) +m4_define([ev_view_lt_current],[3]) 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]) @@ -306,13 +306,6 @@ fi AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"]) -dnl ========= Check for Desktop Schemas -PKG_CHECK_MODULES([DESKTOP_SCHEMAS], [gsettings-desktop-schemas], - has_desktop_schemas=yes, has_desktop_schemas=no) -if test x$has_desktop_schemas = xyes; then - AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available]) -fi - dnl ========= Check for GConf AC_MSG_CHECKING([whether GConf support is requested]) @@ -376,8 +369,8 @@ BACKEND_LIBS="$BACKEND_LIBS -lm" AC_SUBST(BACKEND_CFLAGS) AC_SUBST(BACKEND_LIBS) -SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" -SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS -lz -lm" +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" +SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS)