2003-02-14 Padraig O'Briain <padraig.obriain@sun.com>

	* configure.in: Update to work when X is not installed in expected
	location. Fixes bug #105836.

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

diff --git a/ChangeLog b/ChangeLog
index 8ed4a80..b581181 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-14  Padraig O'Briain <padraig.obriain@sun.com>
 
+       * configure.in: Update to work when X is not installed in expected 
+       location. Fixes bug #105836.
+
        * atk-bridge/bridge.c
        (spi_atk_bridge_init_event_type_consts): Look up "link-selected" for
        AtkHypertext

diff --git a/configure.in b/configure.in
index 2148189..a6e73b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -146,30 +146,16 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 AC_SUBST(LIBBONOBO_IDL_DIR)
 
+CFLAGS="$CFLAGS $X_LIBS"
 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"
-    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="$XTST_RPATH_FLAGS -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
+  AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
 fi
 AC_SUBST(XTST_LIBS)
 
 have_xkb=
-AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe",,$X_LIBS)
+AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe")
 if test "x$have_xkb" = "xmaybe"; then 
   AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
 fi
@@ -181,24 +167,9 @@ fi
 have_xinput=
 AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi)
 if test "x$XINPUT_LIBS" = x; then
-  save_LIBS="$LIBS"
-  for xinputpath in /usr/X11R6/lib /usr/openwin/lib; do
-    LIBS="-L$xinputpath -lXi"
-    case "$host" in
-    *solaris*) XINPUT_RPATH_FLAGS="-R$xinputpath" ;;
-    esac
-    AC_MSG_CHECKING(for -lXi in $xinputpath)
-    AC_TRY_LINK([], [XOpenDisplay()], [
-       AC_MSG_RESULT(yes)
-       XINPUT_LIBS="$XINPUT_RPATH_FLAGS -L$xinputpath -lXi"
-        LIBS="$save_LIBS"
-       break],[AC_MSG_RESULT(no)])
-  done
-  if test "x$XINPUT_LIBS" = x; then
-    AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
-  fi                          
-    AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
-fi
+  AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
+fi                            
+AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
 AC_SUBST(XINPUT_LIBS)
 
 AC_SUBST(CFLAGS)