Compile fix for --without-x.

Make.rules.in

@@ -84,12 +84,16 @@ LINTS = $(C_SRCS:.c=.ln)
 
 # DLL list
 
+X_DLLS = \
+	ddraw \
+	x11drv
+
 DLLS = \
+	@X_DLLS@ \
 	avifil32 \
 	comctl32 \
 	comdlg32 \
 	dciman32 \
-	ddraw \
 	dinput \
 	dplayx \
 	dsound \
@@ -138,8 +142,7 @@ DLLS = \
 	winmm \
 	winspool.drv \
 	wnaspi32 \
-	wsock32 \
+	wsock32
-	x11drv
 
 # Implicit rules
 

configure.in

@@ -117,8 +117,10 @@ AC_CHECK_HEADERS(dlfcn.h,
 	LIBEXT="a"
 )
 AC_SUBST(XLIB)
-AC_SUBST(X_SRCS)
+AC_SUBST(X_DLLS)
-X_SRCS=""
+X_DLLS=""
+AC_SUBST(XFILES)
+XFILES=""
 AC_SUBST(DGA_SRCS)
 DGA_SRCS=""
 AC_SUBST(MESA_SRCS)
@@ -247,7 +249,8 @@ then
     fi
 
     CPPFLAGS="$ac_save_CPPFLAGS"
-    X_SRCS='$(X_SRCS)'
+    X_DLLS='$(X_DLLS)'
+    XFILES='$(XFILES)'
 else
     XLIB=""
     X_CFLAGS=""

dlls/Makefile.in

@@ -3,12 +3,16 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 
+XFILES = \
+	ddraw/libddraw.@LIBEXT@ \
+	x11drv/libx11drv.@LIBEXT@
+
 DLLFILES = \
+	@XFILES@ \
 	avifil32/libavifil32.@LIBEXT@ \
 	comctl32/libcomctl32.@LIBEXT@ \
 	commdlg/libcomdlg32.@LIBEXT@ \
 	dciman32/libdciman32.@LIBEXT@ \
-	ddraw/libddraw.@LIBEXT@ \
 	dinput/libdinput.@LIBEXT@ \
 	dplayx/libdplayx.@LIBEXT@ \
 	dsound/libdsound.@LIBEXT@ \
@@ -57,8 +61,7 @@ DLLFILES = \
 	winmm/wavemap/libmsacm.drv.@LIBEXT@ \
 	winmm/wineoss/libwineoss.drv.@LIBEXT@ \
 	winsock/libwsock32.@LIBEXT@ \
-	winspool/libwinspool.drv.@LIBEXT@ \
+	winspool/libwinspool.drv.@LIBEXT@
-	x11drv/libx11drv.@LIBEXT@
 
 # extra names for dlls containing multiple spec files
 EXTRADLLNAMES = \

dlls/ddraw/Makefile.in

@@ -26,7 +26,7 @@ DGA_SRCS = \
 	dsurface/dga.c \
 	dga.c
 
-X_SRCS = \
+XFILES = \
 	@DGA_SRCS@ \
 	@MESA_SRCS@ \
 	ddraw/x11.c \
@@ -35,7 +35,7 @@ X_SRCS = \
 	x11.c 
 
 C_SRCS = \
-	@X_SRCS@ \
+	@XFILES@ \
 	convert.c \
 	d3ddevice/main.c \
 	dclipper/main.c \