Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
This commit is contained in:
commit
942b436999
11
configure.ac
11
configure.ac
|
@ -1416,7 +1416,6 @@ AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
|
||||||
|
|
||||||
|
|
||||||
dnl kdrive DDX
|
dnl kdrive DDX
|
||||||
dnl utterly incomplete yet
|
|
||||||
|
|
||||||
XEYPHR_LIBS=
|
XEYPHR_LIBS=
|
||||||
XEPHYR_INCS=
|
XEPHYR_INCS=
|
||||||
|
@ -1463,6 +1462,9 @@ if test "$KDRIVE" = yes; then
|
||||||
|
|
||||||
# check for SDL SDK
|
# check for SDL SDK
|
||||||
AC_CHECK_HEADERS([SDL/SDL.h])
|
AC_CHECK_HEADERS([SDL/SDL.h])
|
||||||
|
if test "x$XSDL" = xauto; then
|
||||||
|
XSDL="$ac_cv_header_SDL_SDL_h"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST(KDRIVE_INCS)
|
AC_SUBST(KDRIVE_INCS)
|
||||||
AC_SUBST(KDRIVE_PURE_INCS)
|
AC_SUBST(KDRIVE_PURE_INCS)
|
||||||
|
@ -1473,8 +1475,6 @@ AM_CONDITIONAL(TSLIB, false)
|
||||||
AM_CONDITIONAL(H3600_TS, false)
|
AM_CONDITIONAL(H3600_TS, false)
|
||||||
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
|
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
|
||||||
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
|
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
|
||||||
#AM_CONDITIONAL(KDRIVEVESA, false)
|
|
||||||
#AM_CONDITIONAL(KDRIVEFBDEV, false)
|
|
||||||
|
|
||||||
# Xephyr needs nanosleep() which is in librt on Solaris
|
# Xephyr needs nanosleep() which is in librt on Solaris
|
||||||
AC_CHECK_FUNC([nanosleep], [],
|
AC_CHECK_FUNC([nanosleep], [],
|
||||||
|
@ -1485,13 +1485,12 @@ XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
|
||||||
AC_SUBST([XEPHYR_LIBS])
|
AC_SUBST([XEPHYR_LIBS])
|
||||||
AC_SUBST([XEPHYR_INCS])
|
AC_SUBST([XEPHYR_INCS])
|
||||||
|
|
||||||
AM_CONDITIONAL(XSDLSERVER, [test x"$ac_cv_header_SDL_SDL_h" = xyes])
|
if test x"$XSDL" = xyes; then
|
||||||
if test x"$ac_cv_header_SDL_SDL_h" = xyes -o x"$XSDL" = xyes; then
|
|
||||||
# PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
|
|
||||||
AC_DEFINE(XSDLSERVER,,[Build Xsdl server])
|
AC_DEFINE(XSDLSERVER,,[Build Xsdl server])
|
||||||
XSDL_LIBS="`sdl-config --libs` $XSERVER_LIBS"
|
XSDL_LIBS="`sdl-config --libs` $XSERVER_LIBS"
|
||||||
XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
|
XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
|
||||||
fi
|
fi
|
||||||
|
AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
|
||||||
AC_SUBST([XSDL_LIBS])
|
AC_SUBST([XSDL_LIBS])
|
||||||
AC_SUBST([XSDL_INCS])
|
AC_SUBST([XSDL_INCS])
|
||||||
|
|
||||||
|
|
|
@ -30,4 +30,4 @@ Xchips_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@
|
Xchips_DEPENDENCIES = $(CHIPS_LIBS)
|
||||||
|
|
|
@ -39,6 +39,4 @@ Xephyr_LDADD = \
|
||||||
|
|
||||||
Xephyr_DEPENDENCIES = \
|
Xephyr_DEPENDENCIES = \
|
||||||
libxephyr.a \
|
libxephyr.a \
|
||||||
libxephyr-hostx.a \
|
libxephyr-hostx.a
|
||||||
@KDRIVE_LIBS@ \
|
|
||||||
../../../exa/libexa.la
|
|
||||||
|
|
|
@ -30,4 +30,4 @@ Xepson_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@
|
Xepson_DEPENDENCIES = $(EPSON_LIBS)
|
||||||
|
|
|
@ -28,6 +28,4 @@ Xfake_LDADD = \
|
||||||
@XSERVER_LIBS@
|
@XSERVER_LIBS@
|
||||||
|
|
||||||
Xfake_DEPENDENCIES = \
|
Xfake_DEPENDENCIES = \
|
||||||
libfake.a \
|
libfake.a
|
||||||
@KDRIVE_LIBS@
|
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,4 @@ Xfbdev_LDADD = \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xfbdev_DEPENDENCIES = \
|
Xfbdev_DEPENDENCIES = \
|
||||||
libfbdev.a \
|
libfbdev.a
|
||||||
@KDRIVE_LIBS@
|
|
||||||
|
|
||||||
|
|
|
@ -32,4 +32,4 @@ Xi810_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@
|
Xi810_DEPENDENCIES = $(I810_LIBS)
|
||||||
|
|
|
@ -34,4 +34,4 @@ Xmach64_LDADD = \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
|
|
||||||
Xmach64_DEPENDENCIES = $(MACH64_LIBS) @KDRIVE_LIBS@
|
Xmach64_DEPENDENCIES = $(MACH64_LIBS)
|
||||||
|
|
|
@ -32,4 +32,4 @@ Xmga_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@
|
Xmga_DEPENDENCIES = $(MGA_LIBS)
|
||||||
|
|
|
@ -44,4 +44,4 @@ Xneomagic_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@
|
Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS)
|
||||||
|
|
|
@ -33,4 +33,4 @@ Xnvidia_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@
|
Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS)
|
||||||
|
|
|
@ -31,4 +31,4 @@ Xpm2_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@
|
Xpm2_DEPENDENCIES = $(PM2_LIBS)
|
||||||
|
|
|
@ -30,4 +30,4 @@ Xr128_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@
|
Xr128_DEPENDENCIES = $(R128_LIBS)
|
||||||
|
|
|
@ -16,5 +16,3 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG) \
|
$(TSLIB_FLAG) \
|
||||||
@XSDL_LIBS@
|
@XSDL_LIBS@
|
||||||
|
|
||||||
Xsdl_DEPENDENCIES = @KDRIVE_LIBS@
|
|
||||||
|
|
|
@ -43,4 +43,4 @@ Xsis_LDADD = \
|
||||||
@KDRIVE_LIBS@ \
|
@KDRIVE_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@
|
Xsis_DEPENDENCIES = $(SIS_LIBS)
|
||||||
|
|
|
@ -35,4 +35,4 @@ Xsmi_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@
|
Xsmi_DEPENDENCIES = $(SMI_LIBS)
|
||||||
|
|
|
@ -32,5 +32,4 @@ Xvesa_LDADD = \
|
||||||
@XSERVER_LIBS@
|
@XSERVER_LIBS@
|
||||||
|
|
||||||
Xvesa_DEPENDENCIES = \
|
Xvesa_DEPENDENCIES = \
|
||||||
libvesa.a \
|
libvesa.a
|
||||||
@KDRIVE_LIBS@
|
|
||||||
|
|
|
@ -31,4 +31,4 @@ Xvia_LDADD = \
|
||||||
@XSERVER_LIBS@ \
|
@XSERVER_LIBS@ \
|
||||||
$(TSLIB_FLAG)
|
$(TSLIB_FLAG)
|
||||||
|
|
||||||
Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@
|
Xvia_DEPENDENCIES = $(VIA_LIBS)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user