X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=fe8b2fac4323e5e41995f6b9e3f5561e09009edf;hb=c089a8ddfeefd0633dfc640d493c03e8c33df262;hp=81df4ce0db4c7ee7171f38203785f1e8d47579bc;hpb=349c3b0d84584c3c91501bb5daaf2ee65a3f74aa;p=platform%2Fupstream%2Fatk.git diff --git a/configure.ac b/configure.ac index 81df4ce..fe8b2fa 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], [7]) -m4_define([atk_micro_version], [3]) +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]) @@ -215,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 @@ -222,6 +238,7 @@ atk.pc atk-uninstalled.pc atk/Makefile atk/atk.rc +atk/atkversion.h tests/Makefile build/Makefile build/win32/Makefile