Re: [g-a-devel]at-spi bug 105836

[Bill Haneman <bill haneman sun com>]

On Fri, 2003-02-14 at 17:19, Padraig O'Briain wrote:
> This bug complains about build problems when X is not installed in the normal 
> location.
> 
> Patch to fix the problem is attached. OK to commit?

Yes, please :-)


> Padraig
> 
> ______________________________________________________________________
> 
> Index: configure.in
> ===================================================================
> RCS file: /cvs/gnome/at-spi/configure.in,v
> retrieving revision 1.60
> diff -u -p -r1.60 configure.in
> --- configure.in	18 Dec 2002 15:28:38 -0000	1.60
> +++ configure.in	14 Feb 2003 08:51:41 -0000
> @@ -146,30 +146,16 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
>  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)
-- 
Bill Haneman <bill haneman sun com>