* atk-bridge/bridge.c:

[platform/core/uifw/at-spi2-atk.git] / configure.in

diff --git a/configure.in b/configure.in
index 87eebac..6d1a631 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=0
-AT_SPI_MINOR_VERSION=0
-AT_SPI_MICRO_VERSION=8
+AT_SPI_MINOR_VERSION=12
+AT_SPI_MICRO_VERSION=1
 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"
@@ -82,12 +82,22 @@ dnl NOTE: We need to use a separate automake conditional for this
 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)
+       gail >= 0.11)
 AC_SUBST(LIBSPI_LIBS)
 AC_SUBST(LIBSPI_CFLAGS)
 
@@ -101,16 +111,16 @@ 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)
+       gtk+-2.0 >= 2.0.0 \
+       gail >= 0.11)
 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)
+       gtk+-2.0 >= 2.0.0 \
+       gdk-pixbuf-2.0 >= 2.0.0
+       gdk-pixbuf-xlib-2.0 >= 2.0.0)
 AC_SUBST(UTILS_LIBS)
 AC_SUBST(UTILS_CFLAGS)
 
@@ -122,7 +132,7 @@ AC_SUBST(ATK_BRIDGE_CFLAGS)
 
 PKG_CHECK_MODULES(LIBCSPI, \
        libbonobo-2.0 >= 1.107.0 \
-       atk >= 0.10)
+       atk >= 1.0.0)
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 
@@ -159,8 +169,19 @@ 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/])
+])
 
 AC_OUTPUT([
 Makefile