X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=fe8b2fac4323e5e41995f6b9e3f5561e09009edf;hb=e6d27f54d658fbfb0ca4df2e57e16a05c491b752;hp=d2450683eefa55f4df9257cbf14a4860569fa6ef;hpb=2966f498c6c5d7c9ebc7c61d0f2a96c4ca95979b;p=platform%2Fupstream%2Fatk.git

diff --git a/configure.ac b/configure.ac
index d245068..fe8b2fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,23 +15,24 @@ dnl if backwards compatibility has been broken,
 dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 
 dnl The triplet 
-m4_define([atk_major_version], [1])
-m4_define([atk_minor_version], [33])
-m4_define([atk_micro_version], [6])
+m4_define([atk_major_version], [2])
+m4_define([atk_minor_version], [12])
+m4_define([atk_micro_version], [0])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
-dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2.
+dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 3.
 m4_define([atk_api_version], [1.0])
 
 dnl Number of releases since we've added interfaces
 m4_define([atk_interface_age], [1])
 
+dnl binary_age includes major version as ATK 2 is still fully API and ABI compatible
 m4_define([atk_binary_age],
-          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version)])
+          [m4_eval(10000 * atk_major_version + 100 * atk_minor_version + 10 + atk_micro_version)])
 
 m4_define([lt_current],
-          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])
+          [m4_eval(10000 * atk_major_version + 100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])
 m4_define([lt_revision], [atk_interface_age])
 m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)])
 m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
@@ -159,7 +160,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-GLIB_REQUIRED_VERSION=2.0.0
+GLIB_REQUIRED_VERSION=2.31.2
 GLIB_PACKAGES="gobject-2.0"
 AC_SUBST(GLIB_PACKAGES)
 AC_SUBST(GLIB_REQUIRED_VERSION)
@@ -214,6 +215,22 @@ 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")
+
+GNOME_COMPILE_WARNINGS([maximum])
+
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
@@ -221,6 +238,7 @@ atk.pc
 atk-uninstalled.pc
 atk/Makefile
 atk/atk.rc
+atk/atkversion.h
 tests/Makefile
 build/Makefile
 build/win32/Makefile