--- client/gui-xaw/graphics.c.orig	Fri Aug 20 21:21:21 1999
+++ client/gui-xaw/graphics.c	Fri Aug 20 21:15:23 1999
@@ -21,7 +21,12 @@
 
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
+
+#ifdef XPM_H_NO_X11
+#include <xpm.h>
+#else
 #include <X11/xpm.h>
+#endif
 
 #include "game.h"
 #include "log.h"
--- configure.in.orig	Fri Aug 20 21:05:39 1999
+++ configure.in	Fri Aug 20 21:04:55 1999
@@ -176,6 +176,10 @@
         elif test "$ac_R_space" = "yes"; then
             X_LIBS="$X_LIBS -R $xpm_libdir"
         fi
+	dnl Some sites may put xpm.h in a directory whose parent isn't "X11"
+	if test "x$xpm_h_no_x11" = "xyes"; then
+	    AC_DEFINE(XPM_H_NO_X11)
+	fi
     fi
     fc_save_X_LIBS="$X_LIBS"
     X_LIBS="$X_LIBS $X_PRE_LIBS"
--- acinclude.m4.orig	Fri Aug 20 20:49:02 1999
+++ acinclude.m4	Fri Aug 20 20:53:38 1999
@@ -139,6 +139,9 @@
     fc_xpm_default_inc="$fc_xpm_default/include"
     if test -r $fc_xpm_default_inc/X11/xpm.h; then
         xpm_incdir=$fc_xpm_default_inc
+    elif test -r $fc_xpm_default_inc/xpm.h; then
+    	xpm_incdir=$fc_xpm_default_inc
+	xpm_h_no_x11=yes
     fi
 fi
 AC_MSG_RESULT([library $xpm_libdir, include $xpm_incdir])
--- config.h.in.orig	Fri Aug 20 21:05:52 1999
+++ config.h.in	Fri Aug 20 21:11:20 1999
@@ -85,6 +85,7 @@
 #undef HAVE_STPCPY
 #undef LOCALEDIR
 #undef HAVE_SIGPIPE
+#undef XPM_H_NO_X11
 #undef ALWAYS_ROOT
 #undef STRICT_WINDOWS
 #undef GENERATING_MAC