Imported Upstream version 1.2.4

[platform/upstream/json-glib.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b26ca16..8c17f68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # bump micro_version to the next odd number after each release
 m4_define([json_major_version], [1])
 m4_define([json_minor_version], [2])
-m4_define([json_micro_version], [2])
+m4_define([json_micro_version], [4])
 
 m4_define([json_version], [json_major_version.json_minor_version.json_micro_version])
 
@@ -13,7 +13,7 @@ m4_define([json_release_status],
 
 # bump up by 1 for every micro release with no API changes, otherwise
 # set to 0. after release, bump up by 1
-m4_define([json_interface_age], [2])
+m4_define([json_interface_age], [4])
 m4_define([json_binary_age], [m4_eval(100 * json_minor_version + json_micro_version)])
 
 m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version - json_interface_age)])
@@ -361,6 +361,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
                    [The prefix for our gettext translation domains.])
 AS_ALL_LINGUAS
 
+dnl === MSVC toolset ==========================================================
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
 dnl === Output ================================================================
 
 AC_SUBST(JSON_CFLAGS)
@@ -374,10 +378,13 @@ AC_CONFIG_FILES([
         build/win32/Makefile
         build/win32/config.h.win32
         build/win32/vs9/Makefile
+        build/win32/vs9/json-glib-version-paths.vsprops
         build/win32/vs10/Makefile
+        build/win32/vs10/json-glib-version-paths.props
         build/win32/vs11/Makefile
         build/win32/vs12/Makefile
         build/win32/vs14/Makefile
+        build/win32/vs15/Makefile
 
         json-glib/Makefile
         json-glib/json-glib.pc