AT_SPI_MAJOR_VERSION=1
AT_SPI_MINOR_VERSION=7
-AT_SPI_MICRO_VERSION=6
+AT_SPI_MICRO_VERSION=14
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)
dnl required versions of other tools.
m4_define([req_ver_atk], [1.12.0])
+m4_define([req_ver_gtk], [2.10.0])
+m4_define([req_ver_gail], [1.9.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])
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
PKG_CHECK_MODULES(LIBSPI, [
libbonobo-2.0 >= req_ver_libbonobo
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(ATK_BRIDGE, [
libbonobo-2.0 >= req_ver_libbonobo
atk >= req_ver_atk
-])
+])
AC_SUBST(ATK_BRIDGE_LIBS)
AC_SUBST(ATK_BRIDGE_CFLAGS)
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)
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)