2004-10-27  Stepan Kasal  <address@hidden>

	* lib/autoconf/programs.m4 (AC_PROG_AWK): On Solaris, it's
	  necessary to check for /usr/xpg4/bin/awk before nawk and awk.

Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.33
diff -u -r1.33 programs.m4
--- lib/autoconf/programs.m4	5 Sep 2004 22:26:22 -0000	1.33
+++ lib/autoconf/programs.m4	27 Oct 2004 09:44:04 -0000
@@ -350,13 +350,18 @@
 # (But of course when keeping related things together).
 
 # Check for gawk first since it's generally better.
+# On Solaris, /usr/xpg4/bin/awk is good, while both /bin/awk
+# and /bin/nawk are unusable.
 AN_MAKEVAR([AWK],  [AC_PROG_AWK])
 AN_PROGRAM([awk],  [AC_PROG_AWK])
 AN_PROGRAM([gawk], [AC_PROG_AWK])
 AN_PROGRAM([mawk], [AC_PROG_AWK])
 AN_PROGRAM([nawk], [AC_PROG_AWK])
 AC_DEFUN([AC_PROG_AWK],
-[AC_CHECK_PROGS(AWK, gawk mawk nawk awk, )])
+[AC_CHECK_PROGS(AWK, gawk mawk)
+AC_PATH_PROG(AWK, awk, , /usr/xpg4/bin)
+AC_CHECK_PROGS(AWK, nawk awk)
+])
 
 
 # AC_PROG_EGREP