X11 header detetion needs to move to xpdev now too.

src/conio/Common.gmake

-X_PATH ?=      $(shell if [ -f /usr/X11R6/include/X11/Xlib.h ]; then echo /usr/X11R6 ; elif [ -f /usr/X11R7/include/X11/Xlib.h ] ; then echo /usr/X11R7 ; elif [ -f /usr/X11/include/X11/Xlib.h ] ; then echo /usr/X11 ; elif [ -f /usr/X/include/X11/Xlib.h ] ; then echo /usr/X ; elif [ -f /usr/include/X11/Xlib.h ] ; then echo /usr ; else echo 0 ; fi)
-
-ifeq ($(os),sunos)
- X_PATH	?=	/usr/X
-else
- X_PATH ?=	/usr/X11R6
-endif
-X_HEADERS	?=	$(X_PATH)$(DIRSEP)include
-X_PRESENT	= $(shell if [ ! \( -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xlib.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xutil.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)keysym.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xatom.h \) ] ; then echo NO ; else echo YES ; fi )
-ifeq ($(X_PRESENT),NO)
- NO_X=1
-else
- ifeq ($(os),darwin)	# No X11 for OSX
-  ifndef HAS_DLOPEN
-   NO_X=1
-  endif
- endif
-endif
-
 #ifeq ($(os),sunos)
 # CIOLIB-MT_LIBS		+=	$(UL_PRE)curses$(UL_SUF)
 #else

src/conio/GNUmakefile

@@ -8,7 +8,6 @@ OBJS	+=	$(MTOBJODIR)$(DIRSEP)curs_cio$(OFILE)
 ifdef NO_X
  CFLAGS	+=	-DNO_X
 else
- CFLAGS	+=	-I$(X_HEADERS)
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)console$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)x_cio$(OFILE)
 endif

src/xpdev/Common.gmake

@@ -118,3 +118,22 @@ ifdef WITH_SDL
  endif
 endif
 
+X_PATH ?=      $(shell if [ -f /usr/X11R6/include/X11/Xlib.h ]; then echo /usr/X11R6 ; elif [ -f /usr/X11R7/include/X11/Xlib.h ] ; then echo /usr/X11R7 ; elif [ -f /usr/X11/include/X11/Xlib.h ] ; then echo /usr/X11 ; elif [ -f /usr/X/include/X11/Xlib.h ] ; then echo /usr/X ; elif [ -f /usr/include/X11/Xlib.h ] ; then echo /usr ; else echo 0 ; fi)
+
+ifeq ($(os),sunos)
+ X_PATH	?=	/usr/X
+else
+ X_PATH ?=	/usr/X11R6
+endif
+X_HEADERS	?=	$(X_PATH)$(DIRSEP)include
+X_PRESENT	= $(shell if [ ! \( -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xlib.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xutil.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)keysym.h -a -f $(X_HEADERS)$(DIRSEP)X11$(DIRSEP)Xatom.h \) ] ; then echo NO ; else echo YES ; fi )
+ifeq ($(X_PRESENT),NO)
+ NO_X=1
+else
+ ifeq ($(os),darwin)	# No X11 for OSX
+  ifndef HAS_DLOPEN
+   NO_X=1
+  endif
+ endif
+endif
+

src/xpdev/GNUmakefile

@@ -12,6 +12,7 @@ ifeq ($(shell if [ -f /usr/include/alsa/asoundlib.h ] ; then echo YES ; fi),YES)
 endif
 MT_CFLAGS	+=	$(XPDEV-MT_CFLAGS)
 
+MT_CFLAGS	+=	-I$(X_HEADERS)
 ifdef WITH_SDL
  MTOBJS	+=	$(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 endif