Sync from gnulib.

6 files changed, 37 insertions, 13 deletions

diff --git a/build-aux/ChangeLog b/build-aux/ChangeLog
index 0b6110b03..9f865aa7c 100644
--- a/build-aux/ChangeLog
+++ b/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* config.guess, config.sub, texinfo.tex: Sync from gnulib.
+
 2005-05-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* config.guess: Sync from gnulib.
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 21a7ad806..6d71f752f 100644
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-05-15'
+timestamp='2005-05-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -805,9 +805,13 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:* | i*:windows32*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 519f2cd00..8b2c57a6e 100644
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-05-12'
+timestamp='2005-06-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -256,6 +256,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
@@ -274,6 +275,9 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -330,6 +334,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -352,6 +357,8 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 3051a4fec..702790563 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2005-04-17.16}
+\def\texinfoversion{2005-05-20.06}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
@@ -1924,14 +1924,14 @@ where each line of input produces a line of output.}
 \def\keywordfalse{false}
 
 \parseargdef\allowcodebreaks{%
-  \def\arg{#1}%
-  \ifx\arg\keywordtrue
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
     \allowcodebreakstrue
-  \else\ifx\arg\keywordfalse
+  \else\ifx\txiarg\keywordfalse
     \allowcodebreaksfalse
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @allowcodebreaks option `\arg'}%
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
   \fi\fi
 }
 
@@ -1942,16 +1942,16 @@ where each line of input produces a line of output.}
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \parseargdef\kbdinputstyle{%
-  \def\arg{#1}%
-  \ifx\arg\worddistinct
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\arg\wordexample
+  \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\arg\wordcode
+  \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 79f89c24b..e33b7a6bb 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* extensions.m4: Sync from gnulib; this defines
+	_POSIX_PTHREAD_SEMANTICS for the benefit of Solaris.
+
 2005-06-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* mkdir-p.m4: Renamed from makepath.m4.
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 6f34a8d35..e71845f1d 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -21,6 +21,10 @@ AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
 [/* Enable extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
 #endif])
   AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
 ])