AC_INIT(idl/Accessibility.idl)
-AT_SPI_MAJOR_VERSION=0
-AT_SPI_MINOR_VERSION=0
-AT_SPI_MICRO_VERSION=8
+AT_SPI_MAJOR_VERSION=1
+AT_SPI_MINOR_VERSION=1
+AT_SPI_MICRO_VERSION=4
AT_SPI_INTERFACE_AGE=0
-AT_SPI_BINARY_AGE=0
+AT_SPI_BINARY_AGE=4
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
AC_SUBST(AT_SPI_MAJOR_VERSION)
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+AC_PATH_XTRA
+
+if test x$no_x = xyes ; then
+ AC_MSG_ERROR([X development libraries not found])
+else
+ X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+fi
+
+AC_SUBST(X_LIBS)
+
dnl Checks for libraries
PKG_CHECK_MODULES(LIBSPI, \
libbonobo-2.0 >= 1.107.0 \
- atk >= 0.10 \
- gtk+-2.0 >= 1.3.12 \
- gail >= 0.6)
+ atk >= 1.1.0 \
+ gtk+-2.0 > 2.0.0 \
+ gail >= 0.16)
AC_SUBST(LIBSPI_LIBS)
AC_SUBST(LIBSPI_CFLAGS)
PKG_CHECK_MODULES(REGISTRYD, \
libbonobo-2.0 >= 1.107.0 \
- gtk+-2.0 \
- atk >= 0.10)
+ gtk+-2.0 > 2.0.0 \
+ atk >= 1.1.0)
AC_SUBST(REGISTRYD_LIBS)
AC_SUBST(REGISTRYD_CFLAGS)
PKG_CHECK_MODULES(TESTS, \
libbonobo-2.0 >= 1.107.0 \
- atk >= 0.10 \
- gtk+-2.0 >= 1.3.12 \
- gail >= 0.6)
+ atk >= 1.1.0 \
+ gtk+-2.0 > 2.0.0 \
+ gail >= 0.16)
AC_SUBST(TESTS_LIBS)
AC_SUBST(TESTS_CFLAGS)
-PKG_CHECK_MODULES(UTILS, \
- libbonobo-2.0 >= 1.107.0 \
- gtk+-2.0 >= 1.3.12 \
- gdk-pixbuf-2.0 >= 1.3.0
- gdk-pixbuf-xlib-2.0 >= 1.3.0)
-AC_SUBST(UTILS_LIBS)
-AC_SUBST(UTILS_CFLAGS)
-
PKG_CHECK_MODULES(ATK_BRIDGE, \
libbonobo-2.0 >= 1.107.0 \
- atk >= 0.10)
+ atk >= 1.1.0)
AC_SUBST(ATK_BRIDGE_LIBS)
AC_SUBST(ATK_BRIDGE_CFLAGS)
PKG_CHECK_MODULES(LIBCSPI, \
libbonobo-2.0 >= 1.107.0 \
- atk >= 0.10)
+ atk >= 1.1.0)
AC_SUBST(LIBCSPI_LIBS)
AC_SUBST(LIBCSPI_CFLAGS)
save_LIBS="$LIBS"
for xtstpath in /usr/X11R6/lib /usr/openwin/lib; do
LIBS="-L$xtstpath -lXtst"
+ case "$host" in
+ *solaris*) XTST_RPATH_FLAGS="-R$xtstpath" ;;
+ esac
AC_MSG_CHECKING(for -lXtst in $xtstpath)
AC_TRY_LINK([], [XTestFakeKeyEvent()], [
AC_MSG_RESULT(yes)
- XTST_LIBS="-L$xtstpath -lXtst"
+ XTST_LIBS="$XTST_RPATH_FLAGS -L$xtstpath -lXtst"
LIBS="$save_LIBS"
break],[AC_MSG_RESULT(no)])
done
fi
AC_SUBST(XTST_LIBS)
+have_xkb=
+AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe",,$X_LIBS)
+if test "x$have_xkb" = "xmaybe"; then
+ AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
+fi
+if test "x$have_xkb" = "xyes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_XKB)
+fi
+
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
-AC_CHECK_LIB(popt, poptDupArgv,,
-AC_MSG_ERROR([You must have popt 1.5 or greater to compile the utilities.]))
+AC_CHECK_LIB(popt, poptGetContext, [POPT_LIBS="-lpopt"],
+AC_MSG_ERROR([popt is required to build at-spi.
+You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/]))
+AC_SUBST(POPT_LIBS)
+AC_MSG_CHECKING([for POPT_ARG_FLOAT in popt.h])
+AC_TRY_CPP([#include <popt.h>
+#ifndef POPT_ARG_FLOAT
+#error popt too old
+#endif], AC_MSG_RESULT(yes), [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([A newer version of popt is required to build at-spi.
+You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/])
+])
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+ test -n "$PERL" && \
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+ test -n "$AWK" ; then
+ REBUILD=
+fi
+AC_SUBST(REBUILD)
AC_OUTPUT([
Makefile
idl/Makefile
libspi/Makefile
registryd/Makefile
-registryd/Accessibility_Registry.server
atk-bridge/Makefile
test/Makefile
cspi/Makefile
cspi/bonobo/Makefile
-util/Makefile
-util/Accessibility_Util.server
])
echo "AT-SPI setup: