2001-11-21 Laszlo Peter <laca@ireland.sun.com>

	* configure.in, libspi/Makefile.am: find libXtst.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@106 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 3c0ab03..3143029 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-21  Laszlo Peter  <laca@ireland.sun.com>
+
+       * configure.in, libspi/Makefile.am: find libXtst.
+
 2001-11-21  Michael Meeks  <michael@ximian.com>
 
        * test/accessx-gui.c: s/spi_value/value/ - doh.

diff --git a/configure.in b/configure.in
index 2b8b2ea..9a8df15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -117,6 +117,25 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 AC_SUBST(LIBBONOBO_IDL_DIR)
 
+dnl path to Xtst
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst)
+if test "x$XTST_LIBS" = x; then
+  save_LIBS="$LIBS"
+  for xtstpath in /usr/X11R6/lib /usr/openwin/lib; do
+    LIBS="-L$xtstpath -lXtst"
+    AC_MSG_CHECKING(for -lXtst in $xtstpath)
+    AC_TRY_LINK([], [XTestFakeKeyEvent()], [
+       AC_MSG_RESULT(yes)
+       XTST_LIBS="-L$xtstpath -lXtst"
+        LIBS="$save_LIBS"
+       break],[AC_MSG_RESULT(no)])
+  done
+  if test "x$XTST_LIBS" = x; then
+    AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
+  fi
+fi
+AC_SUBST(XTST_LIBS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index 91f9d5e..d5c2c4f 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I $(top_srcdir)           \
            -I $(top_builddir)         \
            $(LIBSPI_CFLAGS)
 
-LDFLAGS = $(LIBSPI_LIBS) -lXtst @LT_VERSION_INFO@
+LDFLAGS = $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@
 
 DEBUG_CFLAGS=-DSPI_DEBUG