From 16c1defa3dbd8a4388da65e96f53cd767dceb2f3 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sat, 12 Nov 2005 16:36:48 +0000
Subject: x11, used, etc.

---
 src/libdraw/mkwsysrules.sh | 14 +++++++++++---
 src/libdraw/nowsys-wsys.c  |  4 +---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/libdraw')

diff --git a/src/libdraw/mkwsysrules.sh b/src/libdraw/mkwsysrules.sh
index f5cf9caa..72638663 100644
--- a/src/libdraw/mkwsysrules.sh
+++ b/src/libdraw/mkwsysrules.sh
@@ -17,19 +17,27 @@ if [ "x$X11" = "x" ]; then
 fi
 
 if [ "x$WSYSTYPE" = "x" ]; then
-	if [ -d "$X11/include" ]; then
+	if [ -d "$X11" ]; then
 		WSYSTYPE=x11
 	else
 		WSYSTYPE=nowsys
 	fi
 fi
 
+if [ "x$WSYSTYPE" = "xX11" -a "x$X11H" = "x" ]; then
+	if [ -d "$X11/include" ]; then
+		X11H="-I$X11/include"
+	else
+		X11H=""
+	fi
+fi
+	
+
 echo 'WSYSTYPE='$WSYSTYPE
 echo 'X11='$X11
 
 if [ $WSYSTYPE = x11 ]; then
-	echo 'CFLAGS=$CFLAGS -I$X11/include'
+	echo 'CFLAGS=$CFLAGS $X11H'
 	echo 'HFILES=$HFILES $XHFILES'
 fi
 
-
diff --git a/src/libdraw/nowsys-wsys.c b/src/libdraw/nowsys-wsys.c
index 2127dca0..c5b50ad7 100644
--- a/src/libdraw/nowsys-wsys.c
+++ b/src/libdraw/nowsys-wsys.c
@@ -17,8 +17,6 @@ drawtopwindow(void)
 
 void
 drawresizewindow(Rectangle r)
-{
-	USED(r);
-	
+{	
 	bad();
 }
-- 
cgit v1.2.3