build/win32/vs10/Makefile.am: Remove atk-install.props's on re-generation

[platform/upstream/atk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 23b5b1a..1d14d7b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 
 dnl The triplet 
 m4_define([atk_major_version], [2])
-m4_define([atk_minor_version], [15])
-m4_define([atk_micro_version], [3])
+m4_define([atk_minor_version], [22])
+m4_define([atk_micro_version], [0])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
@@ -186,14 +186,14 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
 # i18n stuff
+AM_GNU_GETTEXT_VERSION([0.19.2])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=atk10
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
   [Define the gettext package to be used])
 
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-AM_GLIB_GNU_GETTEXT
-
 # Introspection support
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
@@ -215,20 +215,6 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-# option to specify python interpreter to use; this just sets $PYTHON, so that
-# we will fallback to reading $PYTHON if --with-python is not given, and
-# python.m4 will get the expected input.
-# This dependency on Python is for 'make dist', so normal builds would not
-# need Python
-AC_ARG_WITH(python,
-            AS_HELP_STRING([--with-python=PATH],
-                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-            [PYTHON="$withval"], [])
-if test x"$PYTHON" = xyes; then
-  AC_MSG_ERROR([--with-python option requires a path or program argument])
-fi
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
 # Check for the visibility flags
 ATK_HIDDEN_VISIBILITY_CFLAGS=""
 case "$host" in
@@ -259,8 +245,6 @@ case "$host" in
 esac
 AC_SUBST(ATK_HIDDEN_VISIBILITY_CFLAGS)
 
-GNOME_COMPILE_WARNINGS([maximum])
-
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
@@ -273,9 +257,12 @@ tests/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/atk-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/atk-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs14/Makefile
 docs/Makefile
 docs/version.xml
 atk.spec