Imported Upstream version 1.49.1

[platform/upstream/gobject-introspection.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41d3287..0d837b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 45)
-m4_define(gi_micro_version, 3)
+m4_define(gi_minor_version, 49)
+m4_define(gi_micro_version, 1)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.45.3])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.49.4])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])
@@ -251,6 +251,19 @@ AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
 AC_CHECK_FUNCS([backtrace backtrace_symbols])
 
 # Python
+# 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
+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
+if test -n "$PYTHON" && ! which "$PYTHON"; then
+    AC_MSG_ERROR([Python interpreter $PYTHON does not exist])
+fi
+
 AM_PATH_PYTHON([2.7])
 case "$host" in
 *-*-mingw*)
@@ -364,7 +377,10 @@ config.h.win32
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/gi-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/gi-version-paths.props
 build/win32/vs11/Makefile
-build/win32/vs12/Makefile])
+build/win32/vs12/Makefile
+build/win32/vs14/Makefile])
 AC_OUTPUT