Fix X library configuration some more.
SVN revision: 9939
This commit is contained in:
parent
9345eff0f6
commit
4943f9812b
16
configure.in
16
configure.in
|
@ -163,15 +163,15 @@ echo "have been disabled (this will affect functionality)"
|
|||
AC_MSG_WARN([Module Support Disabled (no dynamic loader)])], -lm)
|
||||
AC_SUBST(DL_LIBS)
|
||||
|
||||
AC_CHECK_LIB(Xtst, XTestQueryExtension,
|
||||
E_X_LIBS="-lXtst $E_X_LIBS", , $X_LIBS)
|
||||
#AC_CHECK_LIB(Xtst, XTestQueryExtension,
|
||||
# E_X_LIBS="-lXtst $E_X_LIBS", , $X_LIBS -lX11)
|
||||
|
||||
AC_CHECK_LIB(Xext, XkbQueryExtension,
|
||||
AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp]), , $X_LIBS)
|
||||
AC_CHECK_LIB(Xext, XShapeQueryExtension,
|
||||
E_X_LIBS="-lXext $E_X_LIBS", , $X_LIBS -lX11)
|
||||
|
||||
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
|
||||
AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
|
||||
XINERAMA_LIBS="-lXinerama", ,$X_LIBS)
|
||||
XINERAMA_LIBS="-lXinerama", , $X_LIBS -lXext -lX11)
|
||||
AC_SUBST(XINERAMA_LIBS)
|
||||
|
||||
AC_ARG_ENABLE(zoom,
|
||||
|
@ -179,7 +179,7 @@ AC_ARG_ENABLE(zoom,
|
|||
if test "x$enable_zoom" = "xyes"; then
|
||||
AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
|
||||
AC_DEFINE(WITH_ZOOM, 1, [Zoom Support])
|
||||
E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS)
|
||||
E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS -lXext -lX11)
|
||||
else
|
||||
echo "zoom has been turned off by request at compiletime"
|
||||
fi
|
||||
|
@ -189,7 +189,7 @@ AC_ARG_ENABLE(xrandr,
|
|||
if test "x$enable_xrandr" = "xyes"; then
|
||||
AC_CHECK_LIB(Xrandr, XRRQueryExtension,
|
||||
AC_DEFINE(HAS_XRANDR, 1, [RandR support])
|
||||
E_X_LIBS="-lXrandr $E_X_LIBS", ,$X_LIBS)
|
||||
E_X_LIBS="-lXrandr $E_X_LIBS", , $X_LIBS -lXext -lX11)
|
||||
AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
|
||||
fi
|
||||
|
||||
|
@ -206,6 +206,8 @@ if test "x$enable_gcc_warnings" = "xyes"; then
|
|||
CFLAGS="$CFLAGS -W -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings #-Wunreachable-code"
|
||||
fi
|
||||
|
||||
AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp])
|
||||
|
||||
AC_SUBST(E_X_LIBS)
|
||||
|
||||
AC_OUTPUT([
|
||||
|
|
Loading…
Reference in New Issue