Import from gnulib.

diff --git a/config/config.sub b/config/config.sub
index c5a77c3871391e75efe02982f96cbbfb1948600d..0f84ac2c51e26d3ad235d42a426233e2a4a46537 100644 (file)
--- a/config/config.sub
+++ b/config/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-11-17'
+timestamp='2004-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1033,6 +1033,10 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
        xps | xps100)
                basic_machine=xps100-honeywell
                ;;

diff --git a/config/texinfo.tex b/config/texinfo.tex
index 44c152a5e2570cc0384002f80b699b534e4421be..c93912a055b8324c6f0971f2e07e4a3a44df2099 100644 (file)
--- a/config/texinfo.tex
+++ b/config/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{2004-11-19.19}
+\def\texinfoversion{2004-11-25.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
@@ -1730,9 +1730,13 @@ where each line of input produces a line of output.}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
+% @b, explicit bold.
 \def\b#1{{\bf #1}}
 \let\strong=\b
 
+% @sansserif, explicit sans.
+\def\sansserif#1{{\sf #1}}
+
 % We can't just use \exhyphenpenalty, because that only has effect at
 % the end of a paragraph.  Restore normal hyphenation at the end of the
 % group within which \nohyphenation is presumably called.

diff --git a/lib/mktime.c b/lib/mktime.c
index b3d90824fa7d7963ff0a4204dc9cd97a84ca90ea..16f5b9a5a72b424f879ff32c6c11a0b3f0d2d594 100644 (file)
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -462,8 +462,9 @@ __mktime_internal (struct tm *tp,
       t2 = t1 + sec_adjustment;
       if (((t1 < t) != (sec_requested < 0))
          | ((t2 < t1) != (sec_adjustment < 0))
-         | ! (*convert) (&t, &tm))
+         | ! (*convert) (&t2, &tm))
        return -1;
+      t = t2;
     }
 
   *tp = tm;

diff --git a/m4/restrict.m4 b/m4/restrict.m4
index 634293892a72ed9659729abb7d96e27c1ad20ad0..c8407782d5daca53f2712d26615b954307296790 100644 (file)
--- a/m4/restrict.m4
+++ b/m4/restrict.m4
@@ -1,4 +1,11 @@
 #serial 1002
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
 # This macro can be removed once we can rely on Autoconf 2.57a or later,
 # since we can then use its AC_C_RESTRICT.