* lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Use shell variable

XMKMF to locate xmkmf.  Make XMKMF precious.  Export CC when
running xmkmf.

diff --git a/ChangeLog b/ChangeLog
index 4e4afc7c02f1e5cd54eba24226ae630712f72d6f..4f0d19a4fdb3c4c577fe3d8b8411b6a3c8a96a2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-26  Pavel Roskin  <proski@gnu.org>
+
+       * lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Use shell variable
+       XMKMF to locate xmkmf.  Make XMKMF precious.  Export CC when
+       running xmkmf.
+
 2005-08-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/m4sugar/m4sh.m4 (_AS_VERSION_COMPARE_PREPARE):

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index f1b30ea8735280613d3b7705cd3e51fb2fba20d8..f0f3fc23fbf179b8f2f39245be6b99ceb8dbdd5c 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -180,7 +180,8 @@ m4_popdef([AC_Lib_Name])dnl
 # Internal subroutine of _AC_PATH_X.
 # Set ac_x_includes and/or ac_x_libraries.
 m4_define([_AC_PATH_X_XMKMF],
-[rm -f -r conftest.dir
+[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
+rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
@@ -188,7 +189,7 @@ if mkdir conftest.dir; then
 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 _ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.