-AC_INIT(idl/Accessibility.idl)
+AC_INIT(xml/Accessibility.xml)
AT_SPI_MAJOR_VERSION=1
-AT_SPI_MINOR_VERSION=7
-AT_SPI_MICRO_VERSION=6
+AT_SPI_MINOR_VERSION=22
+AT_SPI_MICRO_VERSION=0
AT_SPI_INTERFACE_AGE=0
AT_SPI_BINARY_AGE=0
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
# libtool versioning
LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
LT_CURRENT=10
-LT_REVISION=7
+LT_REVISION=11
LT_AGE=10
LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_AGE)
dnl required versions of other tools.
-m4_define([req_ver_atk], [1.12.0])
-m4_define([req_ver_libbonobo], [1.107.0])
-m4_define([req_ver_gail], [1.3.0])
-m4_define([req_ver_gtk], [2.0.0])
+m4_define([req_ver_atk], [1.17.0])
+m4_define([req_ver_gtk], [2.10.0])
+m4_define([req_ver_gail], [1.9.0])
+m4_define([req_ver_dbus_glib], [0.7.0])
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
AC_PROG_INSTALL
AC_ISC_POSIX
+# Check for Python
+
+AM_PATH_PYTHON(2.4)
+
GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS(maximum)
dnl Checks for libraries
PKG_CHECK_MODULES(LIBSPI, [
- libbonobo-2.0 >= req_ver_libbonobo
+ dbus-glib-1 >= req_ver_dbus_glib
atk >= req_ver_atk
- gtk+-2.0 >= req_ver_gtk
- gail >= req_ver_gail
])
AC_SUBST(LIBSPI_LIBS)
AC_SUBST(LIBSPI_CFLAGS)
PKG_CHECK_MODULES(REGISTRYD, [
- libbonobo-2.0 >= req_ver_libbonobo
+ dbus-glib-1 >= req_ver_dbus_glib
atk >= req_ver_atk
gtk+-2.0 >= req_ver_gtk
])
AC_SUBST(REGISTRYD_CFLAGS)
PKG_CHECK_MODULES(TESTS, [
- libbonobo-2.0 >= req_ver_libbonobo
+ dbus-glib-1 >= req_ver_dbus_glib
atk >= req_ver_atk
gtk+-2.0 >= req_ver_gtk
gail >= req_ver_gail
AC_SUBST(TESTS_CFLAGS)
PKG_CHECK_MODULES(ATK_BRIDGE, [
- libbonobo-2.0 >= req_ver_libbonobo
+ dbus-glib-1 >= req_ver_dbus_glib
atk >= req_ver_atk
-])
+])
AC_SUBST(ATK_BRIDGE_LIBS)
AC_SUBST(ATK_BRIDGE_CFLAGS)
PKG_CHECK_MODULES(LIBCSPI, [
- libbonobo-2.0 >= req_ver_libbonobo
+ dbus-glib-1 >= req_ver_dbus_glib
atk >= req_ver_atk
])
AC_SUBST(LIBCSPI_LIBS)
AC_SUBST(LIBCSPI_CFLAGS)
+PKG_CHECK_MODULES(ORBIT, [
+ ORBit-2.0
+])
+AC_SUBST(ORBIT_LIBS)
+AC_SUBST(ORBIT_CFLAGS)
+
dnl orbit-idl.
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
-dnl Bonobo and Bonobo-Activation idl files
-BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
-AC_SUBST(LIBBONOBO_IDL_DIR)
-
LIBS="$LIBS $X_LIBS"
dnl path to Xtst
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
XEVIE_LIBS="-lXext"
AC_DEFINE(HAVE_XEVIE)
else
- AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXext)
+ AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXevie -lXext)
if test "x$have_xevie" = "xmaybe"; then
- AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes)
+ AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes, [], [#include <X11/Xlib.h>])
if test "x$have_xevie" = "xyes"; then
XEVIE_LIBS="-lXext -lXevie"
AC_DEFINE(HAVE_XEVIE)
libloginhelper-1.0.pc
cspi-1.0.pc
cspi-1.0-uninstalled.pc
-docs/Makefile
-docs/reference/Makefile
-docs/reference/cspi/Makefile
-docs/reference/idl/Makefile
-idl/Makefile
libspi/Makefile
-registryd/Makefile
-atk-bridge/Makefile
-login-helper/Makefile
-test/Makefile
-cspi/Makefile
-cspi/bonobo/Makefile
+tools/Makefile
+xml/Makefile
])
echo "AT-SPI setup: