Improved configure checks for XEvie.

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

diff --git a/ChangeLog b/ChangeLog
index 9bc6453..946dfb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-29  Bill Haneman <bill.haneman@sun.com>
+
+       * configure.in: Improved check for HAVE_XEVIE, to detect 
+       presence on XOrg, where -lXevie is a separate library.
+
 2005-03-08  Bill Haneman <bill.haneman@sun.com>
 
        * configure.in, NEWS, README: Revved to 1.6.3.

diff --git a/configure.in b/configure.in
index 4b64ba2..7760936 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -154,11 +154,20 @@ AC_ARG_ENABLE(xevie, [  --enable-xevie  Build with XEViE support [default=yes]],
 
 if test x$enable_xevie = xyes ; then
        have_xevie=
-       AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes")
+       AC_CHECK_LIB(Xext, XevieStart, have_xevie="yes")
 
        if test "x$have_xevie" = "xyes"; then
                XEVIE_LIBS=-lXext
                AC_DEFINE(HAVE_XEVIE)
+       else
+          AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXext)
+          if test "x$have_xevie" = "xmaybe"; then
+             AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xinput=yes)
+             if test "x$have_xevie" = "xyes"; then
+                     XEVIE_LIBS=-lXext -lXevie        
+                     AC_DEFINE(HAVE_XEVIE)
+             fi
+          fi   
        fi
        AC_SUBST(XEVIE_LIBS)
 fi