X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=61a7ff8e6338e507fdc34a97963afd29c2520517;hb=a5231a61a0f44d710d7f69c9c3e404f09569f0b7;hp=8730154b2612cb0faf08335f49a4997d6c4c2acb;hpb=e504dcc8929a88f5571d46cc6f1027fc07a65f8f;p=evince.git diff --git a/configure.ac b/configure.ac index 8730154b..61a7ff8e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ 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]) @@ -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)