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], [32])
+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])
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)
AM_GLIB_GNU_GETTEXT
# Introspection support
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+#GOBJECT_INTROSPECTION_CHECK([0.6.7])
# Documentation support
-GTK_DOC_CHECK([1.13])
+#GTK_DOC_CHECK([1.13])
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
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")
+
AC_CONFIG_FILES([
Makefile
-po/Makefile.in
atk.pc
atk-uninstalled.pc
atk/Makefile
atk/atk.rc
+atk/atkversion.h
tests/Makefile
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
+build/win32/vs10/Makefile
docs/Makefile
docs/version.xml
atk.spec
atk-zip.sh
+config.h.win32
])
AC_OUTPUT