import upstream patches into Autoconf

[Paul Eggert]

In preparation for a release I installed this:

2006-11-16  Paul Eggert  <address@hidden>

        Import these changes from config via gnulib:

        2006-11-15  Ben Elliston  <address@hidden>

        From Josselin Mouette <address@hidden>:
        * build-aux/config.guess (SX-8:SUPER-UX:*:*): New.

        2006-11-08  Ben Elliston  <address@hidden>

        * build-aux/config.guess (authenticamd:Interix*:[3456]*): Another AMD64.

        2006-11-07  Steve Woodford  <address@hidden>
                    Ben Elliston  <address@hidden>

        * build-aux/config.guess (*:NetBSD:*:*): Handle sh5el arch.
        * build-aux/config.sub (sh5el): New basic_machine.


        Import this change from coreutils:

        2006-02-13  Jim Meyering  <address@hidden>

        * GNUmakefile (all): Emit diagnostics to stderr, not stdout.


        Import this change from gnustandards via gnulib:

        2006-11-15  Karl Berry  <address@hidden>

        * standards.texi: core -> memory, throughout.
        (CPU Portability): show correct example of calling write
        on a char value; thanks to Paul Eggert for the code.
        Both of these suggestions from Eugene Y. Vasserman.


        Import these changes from texinfo via gnulib:

        2006-11-08  Karl Berry  <address@hidden>

        * build-aux/texinfo.tex (\dopdfimage): look for png, jpg/jpeg/JPG, and
          as well as pdf images, since they are supported in pdftex with
          no further ado.

        2006-11-05  Karl Berry  <address@hidden>

        * doc/texinfo.tex (Image Syntax): don't mention GIF any more.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/autoconf/autoconf/GNUmakefile,v
retrieving revision 1.6
diff -p -u -r1.6 GNUmakefile
--- GNUmakefile 14 May 2005 07:00:39 -0000      1.6
+++ GNUmakefile 16 Nov 2006 23:59:41 -0000
@@ -4,7 +4,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006 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
@@ -46,8 +46,8 @@ include $(srcdir)/Makefile.maint
 else
 
 all:
-       @echo There seems to be no Makefile in this directory.
-       @echo "You must run ./configure before running \`make'."
+       @echo There seems to be no Makefile in this directory.   1>&2
+       @echo "You must run ./configure before running \`make'." 1>&2
        @exit 1
 
 endif
Index: build-aux/config.guess
===================================================================
RCS file: /cvsroot/autoconf/autoconf/build-aux/config.guess,v
retrieving revision 1.1
diff -p -u -r1.1 config.guess
--- build-aux/config.guess      24 Aug 2006 22:56:47 -0000      1.1
+++ build-aux/config.guess      16 Nov 2006 23:59:41 -0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2006-11-15'
 
 # 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
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
+           sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -793,7 +794,7 @@ EOF
     x86:Interix*:[3456]*)
        echo i586-pc-interix${UNAME_RELEASE}
        exit ;;
-    EM64T:Interix*:[3456]*)
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
        echo x86_64-unknown-interix${UNAME_RELEASE}
        exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -1208,6 +1209,9 @@ EOF
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
        exit ;;
+    SX-8:SUPER-UX:*:*)
+       echo sx8-nec-superux${UNAME_RELEASE}
+       exit ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit ;;
Index: build-aux/config.sub
===================================================================
RCS file: /cvsroot/autoconf/autoconf/build-aux/config.sub,v
retrieving revision 1.2
diff -p -u -r1.2 config.sub
--- build-aux/config.sub        15 Oct 2006 00:58:26 -0000      1.2
+++ build-aux/config.sub        16 Nov 2006 23:59:41 -0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2006-11-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -925,6 +925,9 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
Index: build-aux/texinfo.tex
===================================================================
RCS file: /cvsroot/autoconf/autoconf/build-aux/texinfo.tex,v
retrieving revision 1.3
diff -p -u -r1.3 texinfo.tex
--- build-aux/texinfo.tex       23 Oct 2006 06:21:53 -0000      1.3
+++ build-aux/texinfo.tex       16 Nov 2006 23:59:41 -0000
@@ -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{2006-10-15.13}
+\def\texinfoversion{2006-11-08.17}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -1255,6 +1255,11 @@ where each line of input produces a line
   \HyPsdSubst{)}{\realbackslash)}{#1}%
 }
 
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found.  (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
+
 \ifpdf
   \input pdfcolor
   \pdfcatalog{/PageMode /UseOutlines}%
@@ -1262,6 +1267,36 @@ where each line of input produces a line
   \def\dopdfimage#1#2#3{%
     \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
     \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    %
+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+    % others).  Let's try in that order.
+    \let\pdfimgext=\empty
+    \begingroup
+      \openin 1 #1.png \ifeof 1
+        \openin 1 #1.jpg \ifeof 1
+          \openin 1 #1.jpeg \ifeof 1
+            \openin 1 #1.JPG \ifeof 1
+              \openin 1 #1.pdf \ifeof 1
+                \errhelp = \nopdfimagehelp
+                \errmessage{Could not find image file #1 for pdf}%
+              \else
+                \gdef\pdfimgext{pdf}%
+              \fi
+            \else
+              \gdef\pdfimgext{JPG}%
+            \fi
+          \else
+            \gdef\pdfimgext{jpeg}%
+          \fi
+        \else
+          \gdef\pdfimgext{jpg}%
+        \fi
+      \else
+        \gdef\pdfimgext{png}%
+      \fi
+      \closein 1
+    \endgroup
+    %
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1272,9 +1307,9 @@ where each line of input produces a line
       \ifdim \wd0 >0pt width \imagewidth \fi
       \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+         #1.\pdfimgext
        \else
-         {#1.pdf}%
+         {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
Index: doc/standards.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/standards.texi,v
retrieving revision 1.73
diff -p -u -r1.73 standards.texi
--- doc/standards.texi  24 Aug 2006 22:57:30 -0000      1.73
+++ doc/standards.texi  16 Nov 2006 23:59:42 -0000
@@ -3,7 +3,7 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
address@hidden lastupdate August 19, 2006
address@hidden lastupdate November 15, 2006
 @c %**end of header
 
 @dircategory GNU organization
@@ -149,7 +149,7 @@ irrelevant and dissimilar to your result
 
 For example, Unix utilities were generally optimized to minimize
 memory use; if you go for speed instead, your program will be very
-different.  You could keep the entire input file in core and scan it
+different.  You could keep the entire input file in memory and scan it
 there instead of using stdio.  Use a smarter algorithm discovered more
 recently than the Unix program.  Eliminate use of temporary files.  Do
 it in one pass instead of two (we did this in the assembler).
@@ -2144,7 +2144,7 @@ Print the version number.
 If a program typically uses just a few meg of memory, don't bother making any
 effort to reduce memory usage.  For example, if it is impractical for
 other reasons to operate on files more than a few meg long, it is
-reasonable to read entire input files into core to operate on them.
+reasonable to read entire input files into memory to operate on them.
 
 However, for programs such as @code{cat} or @code{tail}, that can
 usefully operate on very large files, it is important to avoid using a
@@ -2152,10 +2152,10 @@ technique that would artificially limit 
 If a program works by lines and could be applied to arbitrary
 user-supplied input files, it should keep only a line in memory, because
 this is not very hard and users will want to be able to operate on input
-files that are bigger than will fit in core all at once.
+files that are bigger than will fit in memory all at once.
 
 If your program creates complicated data structures, just make them in
-core and give a fatal error if @code{malloc} returns zero.
+memory and give a fatal error if @code{malloc} returns zero.
 
 @node File Usage
 @section File Usage
@@ -2563,8 +2563,9 @@ Don't declare both a structure tag and v
 same declaration.  Instead, declare the structure tag separately
 and then use it to declare the variables or typedefs.
 
-Try to avoid assignments inside @code{if}-conditions.  For example,
-don't write this:
+Try to avoid assignments inside @code{if}-conditions (assignments
+inside @code{while}-conditions are ok).  For example, don't write
+this:
 
 @example
 if ((foo = (char *) malloc (sizeof *foo)) == 0)
@@ -2736,8 +2737,21 @@ machines.  Thus, don't make the followin
 @example
 int c;
 @dots{}
-while ((c = getchar()) != EOF)
-  write(file_descriptor, &c, 1);
+while ((c = getchar ()) != EOF)
+  write (file_descriptor, &c, 1);
address@hidden example
+
address@hidden Instead, use @code{unsigned char} as follows.  (The 
@code{unsigned}
+is for portability to unusual systems where @code{char} is signed and
+where there is integer overflow checking.)
+
address@hidden
+int c;
+while ((c = getchar ()) != EOF)
+  @{
+    unsigned char u = c;
+    write (file_descriptor, &u, 1);
+  @}
 @end example
 
 It used to be ok to not worry about the difference between pointers