diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index ee299e6e..d2c54139 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl =========================================================================== m4_define(glib_minver, 2.28.0) m4_define(gio_minver, 2.26.0) -m4_define(mate_desktop_minver, 1.5.0) +m4_define(mate_desktop_minver, 1.7.1) m4_define(pango_minver, 1.1.2) m4_define(gtk_minver, 2.24.0) m4_define(xml_minver, 2.4.7) @@ -20,7 +20,7 @@ dnl Interface break is not allowed. m4_define(caja_extension_current, 5) m4_define(caja_extension_revision, 0) -AC_INIT([caja], [1.6.1], [http://www.mate-desktop.org]) +AC_INIT([mate-file-manager], [1.6.2], [http://www.mate-desktop.org]) dnl --------------------------------------------------------------------------- dnl GTK library version @@ -43,9 +43,11 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.24.0 + GAIL_API_VERSION= ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 + GAIL_API_VERSION=-3.0 ;; esac @@ -55,7 +57,7 @@ AC_CONFIG_SRCDIR(src) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 tar-ustar]) +AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) @@ -95,7 +97,7 @@ PKG_CHECK_MODULES(ALL, [ pango >= pango_minver gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libxml-2.0 >= xml_minver - gail >= gail_minver + gail$GAIL_API_VERSION >= gail_minver ]) dnl ========================================================================== @@ -270,10 +272,9 @@ if test "x$enable_packagekit" != "xno"; then fi -dnl ============================================================================ -dnl | se comprueba unique -dnl | de lo contrario, se intenta utilizar libunique -dnl ============================================================================ +#============================================================================ +# libunique +#============================================================================ case "$with_gtk" in 2.0) LIBUNIQUE_VERSION=1.0 ;; @@ -291,8 +292,8 @@ AC_ARG_ENABLE(unique, [ --enable-unique enable the use of libunique ins if test "x$enable_libunique" = "xyes"; then UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DUSE_UNIQUE=1" # fix for deprecated on 2.26 - # unique en la version 1.0, contiene simbolos no definidos a partir de - # glib 2.26, pero puede ser obviado si se utiliza -DG_CONST_RETURN=const + # unique, on 1.0 version, has deprecated symbols in glib 2.26, but + # we avoid problems using -DG_CONST_RETURN=const if $PKG_CONFIG --atleast-version 2.26 glib-2.0; then UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DG_CONST_RETURN=const" fi @@ -301,9 +302,8 @@ if test "x$enable_libunique" = "xyes"; then fi -dnl ========================================================================== - -dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. +# ========================================================================== +# Turn on the additional warnings last, so -Werror doesn't affect other tests. WARNING_CFLAGS="" @@ -406,7 +406,7 @@ AC_SUBST(LIBCAJA_EXTENSION_LIBS) dnl core caja PKG_CHECK_MODULES(GMODULE, gmodule-2.0, [GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) -CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION" +CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail$GAIL_API_VERSION libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION" CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" |