--- a/configure	Mon Jun 05 21:51:12 2006 +0000
+++ b/configure	Tue Jun 06 00:18:29 2006 +0000
@@ -9133,7 +9133,7 @@
   # If user set --with-cflags-optimization, use it to unilaterally
   # determine whether optimization should be enabled.
   if test "$cflags_optimization_specified" = "yes" ; then
-    if -z "$with_cflags_optimization" ; then
+    if test -z "$with_cflags_optimization" ; then
       with_optimization=no
     else
       with_optimization=yes
@@ -16440,7 +16440,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16448,7 +16448,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -16475,7 +16475,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -16496,11 +16496,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
-int
-main ()
-{
-XtMalloc (0)
+#include <X11/Xlib.h>
+int
+main ()
+{
+XrmInitialize ()
   ;
   return 0;
 }