Lines 199-213
AC_SUBST(REMOTE_LIBS)
Link Here
|
199 |
|
199 |
|
200 |
AC_PATH_X |
200 |
AC_PATH_X |
201 |
|
201 |
|
202 |
CFLAGS="-I$x_includes $CFLAGS" |
202 |
if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then |
203 |
LIBS="-L$x_libraries $LIBS" |
203 |
X_INCLUDES=-L`echo $x_includes | sed -e "s/:/ -I/g"` |
|
|
204 |
fi |
205 |
if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then |
206 |
X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"` |
207 |
fi |
208 |
CFLAGS="$X_INCLUDES $CFLAGS" |
209 |
LIBS="$X_LIBRARIES $LIBS" |
204 |
|
210 |
|
205 |
XTEST_LIBS="" |
211 |
XTEST_LIBS="" |
206 |
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, |
212 |
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, |
207 |
XTEST_LIBS="-lX11 -lXtst -L$x_libraries" |
213 |
XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" |
208 |
AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]), |
214 |
AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]), |
209 |
, |
215 |
, |
210 |
-L$x_libraries) |
216 |
$X_LIBRARIES) |
211 |
AC_SUBST(XTEST_LIBS) |
217 |
AC_SUBST(XTEST_LIBS) |
212 |
|
218 |
|
213 |
have_randr=no |
219 |
have_randr=no |
Lines 217-228
AC_CHECK_LIB(Xrandr, XRRUpdateConfigurat
Link Here
|
217 |
RANDR_LIBS="-lX11 -lXrandr -lXrender" |
223 |
RANDR_LIBS="-lX11 -lXrandr -lXrender" |
218 |
AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library), |
224 |
AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library), |
219 |
:, [#include <X11/Xlib.h>])], : , |
225 |
:, [#include <X11/Xlib.h>])], : , |
220 |
-L$x_libraries -lXrandr -lXrender) |
226 |
$X_LIBRARIES -lXrandr -lXrender) |
221 |
AM_CONDITIONAL(HAVE_RANDR, [test $have_randr = yes]) |
227 |
AM_CONDITIONAL(HAVE_RANDR, [test $have_randr = yes]) |
222 |
AC_SUBST(RANDR_LIBS) |
228 |
AC_SUBST(RANDR_LIBS) |
223 |
|
229 |
|
224 |
dnl Explicitely link against libX11 to avoid problems with crappy linkers |
230 |
dnl Explicitely link against libX11 to avoid problems with crappy linkers |
225 |
X_LIBS="-L$x_libraries -lX11" |
231 |
X_LIBS="$X_LIBRARIES -lX11" |
226 |
AC_SUBST(X_LIBS) |
232 |
AC_SUBST(X_LIBS) |
227 |
|
233 |
|
228 |
dnl Multimedia keys |
234 |
dnl Multimedia keys |