diff -ru xboard-4.4.1.orig/configure.ac xboard-4.4.1/configure.ac
--- xboard-4.4.1.orig/configure.ac	2009-10-31 12:50:50.000000000 -0400
+++ xboard-4.4.1/configure.ac	2009-11-02 00:22:17.874375879 -0500
@@ -123,37 +123,18 @@
 fi
 
 dnl | test if user wants ot use Xaw3d headers
-AC_ARG_WITH([Xaw3d],
-            [AS_HELP_STRING([--with-Xaw3d],
-                            [use Xaw3d instead of Xaw])],
-            [with_xaw3d=yes],
-            [with_xaw3d=no])
-
-XAW_LIBS=
-AS_IF([test "x$with_xaw3d" != xno],
-      [AC_CHECK_LIB([Xaw3d], 
-                    [XawTextReplace],
-                    [AC_SUBST([XAW_LIBS], 
-                              ["-lXaw3d"])
-                     AC_DEFINE([USE_XAW3D], [1],
-                               [Define if you want to use Xaw3d])],
-                    [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")
-		     AC_MSG_FAILURE(
-      		               [--with-Xaw3d was given, but test for Xaw3d failed])],
-			       [-lXaw])])
-if test "$with_xaw3d" == "no" ; then
-   XAW_LIBS="-lXaw"
-fi
-AC_SUBST(XAW_LIBS)
-
-dnl | end Xaw3d test
-
-if test "$xaw_headers" == "no" ; then
-   echo Xaw headers not found 
-   exit 1
-
+AC_ARG_WITH(Xaw3d, 
+[  --with-Xaw3d            use Xaw3d instead of Xaw],
+[ with_xaw3d="$withval"], [enable_xaw3d="no"])
+
+if test "$withval" = yes; then
+       AC_DEFINE(USE_XAW3D)
+       XAW_LIBS="-lXaw3d"
+else
+       XAW_LIBS="-lXaw"
 fi
 
+AC_SUBST(XAW_LIBS)
 
 AC_CANONICAL_HOST
 
diff -ru xboard-4.4.1.orig/xboard.h xboard-4.4.1/xboard.h
--- xboard-4.4.1.orig/xboard.h	2009-10-26 02:04:15.000000000 -0400
+++ xboard-4.4.1/xboard.h	2009-11-02 00:22:45.408375832 -0500
@@ -104,7 +104,7 @@
 
 #define BORDER_X_OFFSET 3
 #define BORDER_Y_OFFSET 27
-#define FIRST_CHESS_PROGRAM	"fairymax"
+#define FIRST_CHESS_PROGRAM	"gnuchess"
 #define SECOND_CHESS_PROGRAM	"fairymax"
 
 /* Default to no flashing (the "usual" XBoard behavior) */