--- a/configure	Wed Jul 19 15:22:38 2006 +0000
+++ b/configure	Wed Jul 19 16:36:37 2006 +0000
@@ -989,15 +989,15 @@
   --with-late-packages=DIR
                           Specify location of late/system packages (instead of
                           default location; same as --with-system-packages).
-  --with-late-packages=DIR
+  --with-system-packages=DIR
                           Specify location of late/system packages (instead of
                           default location; same as --with-late-packages).
   --with-last-packages=DIR
                           Specify location of last/legacy packages (instead of
                           default location; same as --with-legacy-packages).
-  --with-late-packages=DIR
+  --with-legacy-packages=DIR
                           Specify location of late/legacy packages (instead of
-                          default location; same as --with-late-packages).
+                          default location; same as --with-last-packages).
   --with-package-path=PATH
                           Search path for package directories.
   --with-infopath=PATH    Location of info directories
@@ -16478,7 +16478,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16486,7 +16486,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -16513,7 +16513,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -16534,11 +16534,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
+#include <X11/Intrinsic.h>
+int
+main ()
+{
+XtMalloc (0)
   ;
   return 0;
 }