From 871e5956d117cc39bae154c3310c369f7bb44cb4 Mon Sep 17 00:00:00 2001
From: padraigo <padraigo@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Wed, 31 Jul 2002 09:00:36 +0000
Subject: [PATCH] * configure.in: Update required versions of ATK, GTK+ and
 GAIL

* cspi-1.0.pc.in: Add dependency for X include files

* cspi/Makefile.am:
* cspi/bonobo/Makefile.am:
Add $(X_CFLAGS) so that X include files
are picked up even if not in standard place (bug #71686)


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@328 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 ChangeLog               | 11 +++++++++++
 configure.in            | 20 ++++++++++----------
 cspi-1.0.pc.in          |  2 +-
 cspi/Makefile.am        |  1 +
 cspi/bonobo/Makefile.am |  1 +
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 450abf5..05afb31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-31  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* configure.in: Update required versions of ATK, GTK+ and GAIL
+
+	* cspi-1.0.pc.in: Add dependency for X include files
+
+	* cspi/Makefile.am:
+	* cspi/bonobo/Makefile.am: 
+	Add $(X_CFLAGS) so that X include files 
+	are picked up even if not in standard place (bug #71686)
+
 2002-06-25  Bill Haneman  <bill.haneman@sun.com>
 
 	* registryd/deviceeventcontroller.c: fix for 84261
diff --git a/configure.in b/configure.in
index 41e6990..be14ae5 100644
--- a/configure.in
+++ b/configure.in
@@ -95,36 +95,36 @@ 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.11)
+	atk >= 1.0.2 \
+	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.0.2)
 AC_SUBST(REGISTRYD_LIBS)
 AC_SUBST(REGISTRYD_CFLAGS)
 
 PKG_CHECK_MODULES(TESTS, \
 	libbonobo-2.0 >= 1.107.0 \
-	atk >= 0.10 \
-	gtk+-2.0 >= 2.0.0 \
-	gail >= 0.11)
+	atk >= 1.0.2 \
+	gtk+-2.0 > 2.0.0 \
+	gail >= 0.16)
 AC_SUBST(TESTS_LIBS)
 AC_SUBST(TESTS_CFLAGS)
 
 PKG_CHECK_MODULES(ATK_BRIDGE, \
 	libbonobo-2.0 >= 1.107.0 \
-	atk >= 0.10)
+	atk >= 1.0.2)
 AC_SUBST(ATK_BRIDGE_LIBS)
 AC_SUBST(ATK_BRIDGE_CFLAGS)
 
 PKG_CHECK_MODULES(LIBCSPI, \
 	libbonobo-2.0 >= 1.107.0 \
-	atk >= 1.0.0)
+	atk >= 1.0.2)
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 
diff --git a/cspi-1.0.pc.in b/cspi-1.0.pc.in
index a10528b..d23a929 100644
--- a/cspi-1.0.pc.in
+++ b/cspi-1.0.pc.in
@@ -9,4 +9,4 @@ Description: Accessibility Technology software simple client library
 Requires: libspi-1.0
 Version: @VERSION@
 Libs: -L${libdir} -lcspi
-Cflags: -I${includedir}/at-spi-1.0
+Cflags: -I${includedir}/at-spi-1.0 @X_CFLAGS@
diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index 23aea9b..cf3c59e 100644
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -6,6 +6,7 @@ lib_LTLIBRARIES = libcspi.la
 
 INCLUDES = -I $(top_srcdir)           \
            -I $(top_builddir)         \
+           $(X_CFLAGS)                \
            $(LIBCSPI_CFLAGS)
 
 LDFLAGS = $(LIBCSPI_LIBS) @LT_VERSION_INFO@
diff --git a/cspi/bonobo/Makefile.am b/cspi/bonobo/Makefile.am
index d51450e..df8d87f 100644
--- a/cspi/bonobo/Makefile.am
+++ b/cspi/bonobo/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = -I $(top_srcdir)           \
            -I $(top_builddir)         \
+           $(X_CFLAGS)                \
            $(LIBCSPI_CFLAGS)
 
 noinst_LTLIBRARIES = libcspi-bonobo.la
-- 
2.7.4