X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=23a2b9c58172e195290700b49343313413504cb8;hb=e106b75b25c332cc55f7fad83a7e7ff124309b18;hp=e3ec6014114c1988a3db06fbff4869a3ca3d0630;hpb=817045be0160a116fdbb69c4306fe0e47212d565;p=platform%2Fupstream%2Fatk.git diff --git a/configure.ac b/configure.ac index e3ec601..23a2b9c 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], [19]) -m4_define([atk_micro_version], [90]) +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]) @@ -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" && \ @@ -254,13 +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 -build/win32/vs14/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