andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

Browse Source
This commit is contained in:
Ian Romanick 2006-08-29 13:30:37 -07:00
commit 942b436999
18 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1416,7 +1416,6 @@ AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
dnl kdrive DDX
dnl utterly incomplete yet
XEYPHR_LIBS=
XEPHYR_INCS=
@ -1463,6 +1462,9 @@ if test "$KDRIVE" = yes; then
# check for SDL SDK
AC_CHECK_HEADERS([SDL/SDL.h])
if test "x$XSDL" = xauto; then
XSDL="$ac_cv_header_SDL_SDL_h"
fi
fi
AC_SUBST(KDRIVE_INCS)
AC_SUBST(KDRIVE_PURE_INCS)
@ -1473,8 +1475,6 @@ AM_CONDITIONAL(TSLIB, false)
AM_CONDITIONAL(H3600_TS, false)
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(KDRIVEVESA, false)
#AM_CONDITIONAL(KDRIVEFBDEV, false)
# Xephyr needs nanosleep() which is in librt on Solaris
AC_CHECK_FUNC([nanosleep], [],
@ -1485,13 +1485,12 @@ XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])
AM_CONDITIONAL(XSDLSERVER, [test x"$ac_cv_header_SDL_SDL_h" = xyes])
if test x"$ac_cv_header_SDL_SDL_h" = xyes -o x"$XSDL" = xyes; then
# PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
if test x"$XSDL" = xyes; then
AC_DEFINE(XSDLSERVER,,[Build Xsdl server])
XSDL_LIBS="`sdl-config --libs` $XSERVER_LIBS"
XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
fi
AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
AC_SUBST([XSDL_LIBS])
AC_SUBST([XSDL_INCS])

2
hw/kdrive/chips/Makefile.am
View File

@ -30,4 +30,4 @@ Xchips_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@
Xchips_DEPENDENCIES = $(CHIPS_LIBS)

4
hw/kdrive/ephyr/Makefile.am
View File

@ -39,6 +39,4 @@ Xephyr_LDADD = \
Xephyr_DEPENDENCIES = \
libxephyr.a \
libxephyr-hostx.a \
@KDRIVE_LIBS@ \
../../../exa/libexa.la
libxephyr-hostx.a

2
hw/kdrive/epson/Makefile.am
View File

@ -30,4 +30,4 @@ Xepson_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@
Xepson_DEPENDENCIES = $(EPSON_LIBS)

4
hw/kdrive/fake/Makefile.am
View File

@ -28,6 +28,4 @@ Xfake_LDADD = \
@XSERVER_LIBS@
Xfake_DEPENDENCIES = \
libfake.a \
@KDRIVE_LIBS@
libfake.a

4
hw/kdrive/fbdev/Makefile.am
View File

@ -24,6 +24,4 @@ Xfbdev_LDADD = \
$(TSLIB_FLAG)
Xfbdev_DEPENDENCIES = \
libfbdev.a \
@KDRIVE_LIBS@
libfbdev.a

2
hw/kdrive/i810/Makefile.am
View File

@ -32,4 +32,4 @@ Xi810_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@
Xi810_DEPENDENCIES = $(I810_LIBS)

2
hw/kdrive/mach64/Makefile.am
View File

@ -34,4 +34,4 @@ Xmach64_LDADD = \
$(TSLIB_FLAG)
Xmach64_DEPENDENCIES = $(MACH64_LIBS) @KDRIVE_LIBS@
Xmach64_DEPENDENCIES = $(MACH64_LIBS)

2
hw/kdrive/mga/Makefile.am
View File

@ -32,4 +32,4 @@ Xmga_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@
Xmga_DEPENDENCIES = $(MGA_LIBS)

2
hw/kdrive/neomagic/Makefile.am
View File

@ -44,4 +44,4 @@ Xneomagic_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@
Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS)

2
hw/kdrive/nvidia/Makefile.am
View File

@ -33,4 +33,4 @@ Xnvidia_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@
Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS)

2
hw/kdrive/pm2/Makefile.am
View File

@ -31,4 +31,4 @@ Xpm2_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@
Xpm2_DEPENDENCIES = $(PM2_LIBS)

2
hw/kdrive/r128/Makefile.am
View File

@ -30,4 +30,4 @@ Xr128_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@
Xr128_DEPENDENCIES = $(R128_LIBS)

2
hw/kdrive/sdl/Makefile.am
View File

@ -16,5 +16,3 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
@XSERVER_LIBS@ \
$(TSLIB_FLAG) \
@XSDL_LIBS@
Xsdl_DEPENDENCIES = @KDRIVE_LIBS@

2
hw/kdrive/sis300/Makefile.am
View File

@ -43,4 +43,4 @@ Xsis_LDADD = \
@KDRIVE_LIBS@ \
$(TSLIB_FLAG)
Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@
Xsis_DEPENDENCIES = $(SIS_LIBS)

2
hw/kdrive/smi/Makefile.am
View File

@ -35,4 +35,4 @@ Xsmi_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@
Xsmi_DEPENDENCIES = $(SMI_LIBS)

3
hw/kdrive/vesa/Makefile.am
View File

@ -32,5 +32,4 @@ Xvesa_LDADD = \
@XSERVER_LIBS@
Xvesa_DEPENDENCIES = \
libvesa.a \
@KDRIVE_LIBS@
libvesa.a

2
hw/kdrive/via/Makefile.am
View File

@ -31,4 +31,4 @@ Xvia_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@
Xvia_DEPENDENCIES = $(VIA_LIBS)