* doc/autoconf.texi (AC_PATH_X): Update per 2005-08-26 change.

diff --git a/ChangeLog b/ChangeLog
index 58fd718fc258cde2af37f2e0efd067782722701e..0b6a315693aa8c93c5d489b7375b1b1c9632f176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-02  Pavel Roskin  <proski@gnu.org>
+
+       * doc/autoconf.texi (AC_PATH_X): Update per 2005-08-26 change.
+
 2006-04-01  Stepan Kasal  <kasal@ucw.cz>
 
        Clean up _AC_COMPILER_EXEEXT* macros.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index ecf36b36535174171e1dafe122bb79834834badd..caddff2a1d1a76396b94a28091895fb32b0cd70a 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -6586,17 +6586,23 @@ The following macros check for operating system services or capabilities.
 
 @defmac AC_PATH_X
 @acindex{PATH_X}
+@evindex XMKMF
 @cindex X Window System
 Try to locate the X Window System include files and libraries.  If the
 user gave the command line options @option{--x-includes=@var{dir}} and
-@option{--x-libraries=@var{dir}}, use those directories.  If either or
-both were not given, get the missing values by running @code{xmkmf} on a
-trivial @file{Imakefile} and examining the @file{Makefile} that it
-produces.  If that fails (such as if @code{xmkmf} is not present), look
-for the files in several directories where they often reside.  If either
-method is successful, set the shell variables @code{x_includes} and
-@code{x_libraries} to their locations, unless they are in directories
-the compiler searches by default.
+@option{--x-libraries=@var{dir}}, use those directories.
+
+If either or both were not given, get the missing values by running
+@code{xmkmf} (or an executable pointed to by the @code{XMKMF}
+environment variable) on a trivial @file{Imakefile} and examining the
+@file{Makefile} that it produces.  Setting @code{XMKMF} to @samp{false}
+will disable this method.
+
+If this method fails to find the X Window System, @command{configure}
+will look for the files in several directories where they often reside. 
+If either method is successful, set the shell variables
+@code{x_includes} and @code{x_libraries} to their locations, unless they
+are in directories the compiler searches by default.
 
 If both methods fail, or the user gave the command line option
 @option{--without-x}, set the shell variable @code{no_x} to @samp{yes};