X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=9b860fed9f4d942116a3517ada307686571261eb;hb=c968120627a73df4aef9c3cf4d0b63b07ef4aa34;hp=a5447c2832927f5d6eb5627a89ae9a3fa3cc045d;hpb=7e42510e5ccca10248b4aa568be2f5cd0774292e;p=platform%2Fupstream%2Fatk.git

diff --git a/configure.ac b/configure.ac
index a5447c2..9b860fe 100644
--- 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], [13])
-m4_define([atk_micro_version], [1])
+m4_define([atk_minor_version], [23])
+m4_define([atk_micro_version], [4])
 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])
 
@@ -206,6 +206,10 @@ GTK_DOC_CHECK([1.13])
 AC_PROG_AWK
 AC_CHECK_PROGS(PERL, perl5 perl)
 
+# Check whether MSVC toolset is explicitly set
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
 REBUILD=\#
 if test "x$enable_rebuilds" = "xyes" && \
 	test -n "$PERL" && \
@@ -215,20 +219,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 +249,6 @@ case "$host" in
 esac
 AC_SUBST(ATK_HIDDEN_VISIBILITY_CFLAGS)
 
-GNOME_COMPILE_WARNINGS([maximum])
-
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
@@ -270,12 +258,15 @@ atk/Makefile
 atk/atk.rc
 atk/atkversion.h
 tests/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/atk-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/atk-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
+win32/vs15/Makefile
 docs/Makefile
 docs/version.xml
 atk.spec