From cff23616fe45e10c6786a303c8dcfc0a80463a53 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 29 Aug 2006 22:44:09 +0300 Subject: [PATCH 1/2] configure.ac: allow disabling of XSDL --- configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index da3e55d09..bbff3875c 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) From 393dc0a3388d56186181b2bd9bcc1d267747e709 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 29 Aug 2006 22:53:54 +0300 Subject: [PATCH 2/2] kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES --- hw/kdrive/chips/Makefile.am | 2 +- hw/kdrive/ephyr/Makefile.am | 4 +--- hw/kdrive/epson/Makefile.am | 2 +- hw/kdrive/fake/Makefile.am | 4 +--- hw/kdrive/fbdev/Makefile.am | 4 +--- hw/kdrive/i810/Makefile.am | 2 +- hw/kdrive/mach64/Makefile.am | 2 +- hw/kdrive/mga/Makefile.am | 2 +- hw/kdrive/neomagic/Makefile.am | 2 +- hw/kdrive/nvidia/Makefile.am | 2 +- hw/kdrive/pm2/Makefile.am | 2 +- hw/kdrive/r128/Makefile.am | 2 +- hw/kdrive/sdl/Makefile.am | 2 -- hw/kdrive/sis300/Makefile.am | 2 +- hw/kdrive/smi/Makefile.am | 2 +- hw/kdrive/vesa/Makefile.am | 3 +-- hw/kdrive/via/Makefile.am | 2 +- 17 files changed, 16 insertions(+), 25 deletions(-) diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am index e3080774b..4966faeed 100644 --- a/hw/kdrive/chips/Makefile.am +++ b/hw/kdrive/chips/Makefile.am @@ -30,4 +30,4 @@ Xchips_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@ +Xchips_DEPENDENCIES = $(CHIPS_LIBS) diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index f423bfe40..1c65944b9 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -39,6 +39,4 @@ Xephyr_LDADD = \ Xephyr_DEPENDENCIES = \ libxephyr.a \ - libxephyr-hostx.a \ - @KDRIVE_LIBS@ \ - ../../../exa/libexa.la + libxephyr-hostx.a diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am index 0538f4c39..97b0a75b3 100644 --- a/hw/kdrive/epson/Makefile.am +++ b/hw/kdrive/epson/Makefile.am @@ -30,4 +30,4 @@ Xepson_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@ +Xepson_DEPENDENCIES = $(EPSON_LIBS) diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index f3a6a3453..3a53e3dbb 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -28,6 +28,4 @@ Xfake_LDADD = \ @XSERVER_LIBS@ Xfake_DEPENDENCIES = \ - libfake.a \ - @KDRIVE_LIBS@ - + libfake.a diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index fce6df9f4..92464f4e8 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -24,6 +24,4 @@ Xfbdev_LDADD = \ $(TSLIB_FLAG) Xfbdev_DEPENDENCIES = \ - libfbdev.a \ - @KDRIVE_LIBS@ - + libfbdev.a diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am index d676a6902..a611829a3 100644 --- a/hw/kdrive/i810/Makefile.am +++ b/hw/kdrive/i810/Makefile.am @@ -32,4 +32,4 @@ Xi810_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@ +Xi810_DEPENDENCIES = $(I810_LIBS) diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index 299565fdb..e924aef71 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -34,4 +34,4 @@ Xmach64_LDADD = \ $(TSLIB_FLAG) -Xmach64_DEPENDENCIES = $(MACH64_LIBS) @KDRIVE_LIBS@ +Xmach64_DEPENDENCIES = $(MACH64_LIBS) diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index 64d260ede..00b8c56e9 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -32,4 +32,4 @@ Xmga_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@ +Xmga_DEPENDENCIES = $(MGA_LIBS) diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index b37bfc303..75fd4ed7b 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -44,4 +44,4 @@ Xneomagic_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@ +Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am index 48551a3a6..3c31a9842 100644 --- a/hw/kdrive/nvidia/Makefile.am +++ b/hw/kdrive/nvidia/Makefile.am @@ -33,4 +33,4 @@ Xnvidia_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@ +Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am index 1a712072a..4c41c65e8 100644 --- a/hw/kdrive/pm2/Makefile.am +++ b/hw/kdrive/pm2/Makefile.am @@ -31,4 +31,4 @@ Xpm2_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@ +Xpm2_DEPENDENCIES = $(PM2_LIBS) diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am index b33e138e1..d68e155f4 100644 --- a/hw/kdrive/r128/Makefile.am +++ b/hw/kdrive/r128/Makefile.am @@ -30,4 +30,4 @@ Xr128_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@ +Xr128_DEPENDENCIES = $(R128_LIBS) diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am index ba6ed4d4a..cc3873ca8 100644 --- a/hw/kdrive/sdl/Makefile.am +++ b/hw/kdrive/sdl/Makefile.am @@ -16,5 +16,3 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) \ @XSDL_LIBS@ - -Xsdl_DEPENDENCIES = @KDRIVE_LIBS@ diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am index efd1e9ab4..6a6e0bf80 100644 --- a/hw/kdrive/sis300/Makefile.am +++ b/hw/kdrive/sis300/Makefile.am @@ -43,4 +43,4 @@ Xsis_LDADD = \ @KDRIVE_LIBS@ \ $(TSLIB_FLAG) -Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@ +Xsis_DEPENDENCIES = $(SIS_LIBS) diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am index a214e762e..f7f0a6675 100644 --- a/hw/kdrive/smi/Makefile.am +++ b/hw/kdrive/smi/Makefile.am @@ -35,4 +35,4 @@ Xsmi_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@ +Xsmi_DEPENDENCIES = $(SMI_LIBS) diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index 01bc0a3e1..c490205b0 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -32,5 +32,4 @@ Xvesa_LDADD = \ @XSERVER_LIBS@ Xvesa_DEPENDENCIES = \ - libvesa.a \ - @KDRIVE_LIBS@ + libvesa.a diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am index 4d52df9b1..7dcfd7c5b 100644 --- a/hw/kdrive/via/Makefile.am +++ b/hw/kdrive/via/Makefile.am @@ -31,4 +31,4 @@ Xvia_LDADD = \ @XSERVER_LIBS@ \ $(TSLIB_FLAG) -Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@ +Xvia_DEPENDENCIES = $(VIA_LIBS)