X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=870844b33faa8c1f51be142603d21b26ce233bda;hb=5a4d369e0dfac2a5ada591ca16b672754717533b;hp=19de1d050c6b5728b06b720dc269d08cfc9e89e7;hpb=80f310a52682e71df05ccd98b0e79c7603f72164;p=platform%2Fupstream%2Fatk.git

diff --git a/configure.ac b/configure.ac
index 19de1d0..870844b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ 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], [22])
+m4_define([atk_minor_version], [24])
 m4_define([atk_micro_version], [0])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
@@ -44,10 +44,10 @@ AC_INIT([atk],
         [atk])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([ChangeLog])
+AC_CONFIG_SRCDIR([README])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.10 -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-dist-gzip dist-xz tar-ustar])
 
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
@@ -195,10 +195,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
   [Define the gettext package to be used])
 
 # Introspection support
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
 
 # Documentation support
-GTK_DOC_CHECK([1.13])
+GTK_DOC_CHECK([1.25])
 
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
@@ -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" && \
@@ -249,7 +253,6 @@ AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 atk.pc
-atk-uninstalled.pc
 atk/Makefile
 atk/atk.rc
 atk/atkversion.h
@@ -262,10 +265,8 @@ 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
-atk-zip.sh
 config.h.win32
 ])