* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Look for X11/Xlib.h

and XrmInitialize rather than X11/Intrinsic.h and XtMalloc
(which belong to Xt, not X itself).  See Debian bug 327655.
* NEWS: Mention this.

diff --git a/ChangeLog b/ChangeLog
index 46b8b04acc366c4f3768750157266d47cb840555..51ae5845f83e32c36020eaa2b388f3de1273352f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Look for X11/Xlib.h
+       and XrmInitialize rather than X11/Intrinsic.h and XtMalloc
+       (which belong to Xt, not X itself).  See Debian bug 327655.
+       * NEWS: Mention this.
+
 2005-09-07  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/c.m4 (AC_LANG_SOURCE(C)): Remove an incorrect comment.

diff --git a/NEWS b/NEWS
index 63fcc8c8eaa08fd16853786eee04f991e84cd7cb..a7cd36685e29d94a73a8e8652cd313bdaab87161 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,10 @@
 ** AC_C_TYPEOF
   New macro to check for support of 'typeof' syntax a la GNU C.
 
+** AC_PATH_X
+  Now checks for X11/Xlib.h and XrmInitialize (X proper) rather than
+  X11/Intrinsic.h and XtMalloc (Xt).
+
 ** AC_PROG_CC_C89, AC_PROG_CC_C99
   New macros for ISO C99 support.  AC_PROG_CC_C89 and AC_PROG_CC_C99
   check for ANSI C89 and ISO C99 support respectively.

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 0498f273becfe9c756f2f995631cf4c4df46c0fb..e281171e6269ef4828ebd528d5c57c8dd1591af1 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for libraries.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -265,13 +265,13 @@ ac_x_header_dirs='
 /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.
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
 [# We can compile using X headers with no special include directory.
 ac_x_includes=],
 [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
@@ -284,8 +284,8 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
-                                 [XtMalloc (0)])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
+                                 [XrmInitialize (0)])],
                 [LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=],