[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Jun 25 17:23:01 EDT 2007)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon Jun 25 17:23:01 EDT 2007) |
|
Date: |
Mon, 25 Jun 2007 17:23:03 -0400 |
Index: gnulib/lib/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/.cvsignore 22 Feb 2007 00:46:09 -0000 1.4
+++ gnulib/lib/.cvsignore 25 Jun 2007 21:16:31 -0000 1.5
@@ -12,3 +12,7 @@
unistd.h
wchar.h
wctype.h
+sys_stat_.h
+malloca.c
+malloca.h
+malloca.valgrind
Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnulib/lib/Makefile.am 22 Feb 2007 00:46:09 -0000 1.14
+++ gnulib/lib/Makefile.am 25 Jun 2007 21:16:31 -0000 1.15
@@ -34,6 +34,15 @@
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES =
+## begin gnulib module absolute-header
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+
+## end gnulib module absolute-header
+
## begin gnulib module alloca-opt
BUILT_SOURCES += $(ALLOCA_H)
@@ -51,14 +60,6 @@
## end gnulib module alloca-opt
-## begin gnulib module allocsa
-
-libgnu_a_SOURCES += allocsa.h allocsa.c
-
-EXTRA_DIST += allocsa.valgrind
-
-## end gnulib module allocsa
-
## begin gnulib module error
@@ -131,6 +132,14 @@
## end gnulib module link-warning
+## begin gnulib module malloca
+
+libgnu_a_SOURCES += malloca.c
+
+EXTRA_DIST += malloca.h malloca.valgrind
+
+## end gnulib module malloca
+
## begin gnulib module mbswidth
libgnu_a_SOURCES += mbswidth.h mbswidth.c
@@ -183,7 +192,8 @@
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
- -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
+ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
@@ -221,7 +231,8 @@
stdlib.h: stdlib_.h
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''ABSOLUTE_STDLIB_H''@|$(ABSOLUTE_STDLIB_H)|g' \
+ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
-e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
-e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
@@ -274,8 +285,10 @@
string.h: string_.h
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''ABSOLUTE_STRING_H''@|$(ABSOLUTE_STRING_H)|g' \
+ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
-e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
-e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
-e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
-e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
@@ -333,18 +346,22 @@
# We need the following in order to create <sys/stat.h> when the system
# has one that is incomplete.
-sys/stat.h: stat_.h
+sys/stat.h: sys_stat_.h
@MKDIR_P@ sys
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
- < $(srcdir)/stat_.h; \
+ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+ -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \
+ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+ -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \
+ < $(srcdir)/sys_stat_.h; \
} > address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
MOSTLYCLEANDIRS += sys
-EXTRA_DIST += stat_.h
+EXTRA_DIST += sys_stat_.h
## end gnulib module sys_stat
@@ -359,8 +376,9 @@
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
- -e 's|@''ABSOLUTE_SYS_TIME_H''@|$(ABSOLUTE_SYS_TIME_H)|g' \
- -e
's/@''GETTIMEOFDAY_REPLACEMENT''@/$(GETTIMEOFDAY_REPLACEMENT)/g' \
+ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
< $(srcdir)/sys_time_.h; \
} > address@hidden
@@ -390,21 +408,28 @@
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
- -e 's|@''ABSOLUTE_UNISTD_H''@|$(ABSOLUTE_UNISTD_H)|g' \
+ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
-e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
-e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
-e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
-e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
-e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
-e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
-e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
-e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
-e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
-e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
-e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
-e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
-e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
< $(srcdir)/unistd_.h; \
} > address@hidden
mv address@hidden $@
@@ -423,7 +448,9 @@
wchar.h: wchar_.h
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \
+ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
< $(srcdir)/wchar_.h; \
} > address@hidden
mv address@hidden $@
@@ -443,8 +470,9 @@
rm -f address@hidden $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
- -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
- -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \
+ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
< $(srcdir)/wctype_.h; \
} > address@hidden
@@ -488,4 +516,5 @@
if test -n "$$dir" && test -d $$dir; then \
echo "rmdir $$dir"; rmdir $$dir; \
fi; \
- done
+ done; \
+ :
Index: gnulib/lib/alloca_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/alloca_.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/alloca_.h 20 Jun 2006 13:44:13 -0000 1.2
+++ gnulib/lib/alloca_.h 25 Jun 2007 21:16:31 -0000 1.3
@@ -1,6 +1,6 @@
/* Memory allocation on the stack.
- Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004, 2006 Free Software
+ Copyright (C) 1995, 1999, 2001-2004, 2006-2007 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
@@ -20,8 +20,8 @@
/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
means there is a real alloca function. */
-#ifndef _GNULIB_ALLOCA_H
-# define _GNULIB_ALLOCA_H
+#ifndef _GL_ALLOCA_H
+#define _GL_ALLOCA_H
/* alloca (N) returns a pointer to N bytes of memory
allocated on the stack, which will last until the function returns.
@@ -51,4 +51,4 @@
# endif
#endif
-#endif /* _GNULIB_ALLOCA_H */
+#endif /* _GL_ALLOCA_H */
Index: gnulib/lib/getopt_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/getopt_.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/getopt_.h 9 Nov 2006 14:57:44 -0000 1.2
+++ gnulib/lib/getopt_.h 25 Jun 2007 21:16:31 -0000 1.3
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006
+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -101,7 +101,7 @@
# endif
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -216,7 +216,7 @@
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
Index: gnulib/lib/mbswidth.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbswidth.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/mbswidth.h 7 Feb 2007 17:00:38 -0000 1.1
+++ gnulib/lib/mbswidth.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -1,5 +1,5 @@
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000-2004 Free Software Foundation, Inc.
+ Copyright (C) 2000-2004, 2007 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
@@ -30,7 +30,7 @@
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -56,6 +56,6 @@
extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
Index: gnulib/lib/setenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/setenv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/setenv.c 15 Oct 2006 21:09:15 -0000 1.3
+++ gnulib/lib/setenv.c 25 Jun 2007 21:16:32 -0000 1.4
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation,
Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005-2007 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -31,8 +31,10 @@
# include <unistd.h>
#endif
+#if _LIBC || !HAVE_SETENV
+
#if !_LIBC
-# include "allocsa.h"
+# include "malloca.h"
#endif
#if !_LIBC
@@ -160,7 +162,7 @@
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
- new_value = (char *) allocsa (namelen + 1 + vallen);
+ new_value = (char *) malloca (namelen + 1 + vallen);
if (new_value == NULL)
{
__set_errno (ENOMEM);
@@ -180,7 +182,7 @@
if (new_environ[size] == NULL)
{
#if defined USE_TSEARCH && !defined _LIBC
- freesa (new_value);
+ freea (new_value);
#endif
__set_errno (ENOMEM);
UNLOCK;
@@ -200,7 +202,7 @@
STORE_VALUE (new_environ[size]);
}
#if defined USE_TSEARCH && !defined _LIBC
- freesa (new_value);
+ freea (new_value);
#endif
}
@@ -228,7 +230,7 @@
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
- new_value = allocsa (namelen + 1 + vallen);
+ new_value = malloca (namelen + 1 + vallen);
if (new_value == NULL)
{
__set_errno (ENOMEM);
@@ -248,7 +250,7 @@
if (np == NULL)
{
#if defined USE_TSEARCH && !defined _LIBC
- freesa (new_value);
+ freea (new_value);
#endif
__set_errno (ENOMEM);
UNLOCK;
@@ -266,7 +268,7 @@
STORE_VALUE (np);
}
#if defined USE_TSEARCH && !defined _LIBC
- freesa (new_value);
+ freea (new_value);
#endif
}
@@ -326,3 +328,5 @@
weak_alias (__setenv, setenv)
weak_alias (__clearenv, clearenv)
#endif
+
+#endif /* _LIBC || !HAVE_SETENV */
Index: gnulib/lib/setenv.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/setenv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/setenv.h 19 Jun 2006 23:08:57 -0000 1.1
+++ gnulib/lib/setenv.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -1,5 +1,5 @@
/* Setting environment variables.
- Copyright (C) 2001-2004 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2007 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
@@ -22,7 +22,7 @@
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -49,6 +49,6 @@
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
Index: gnulib/lib/stdint_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/stdint_.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/lib/stdint_.h 5 Feb 2007 16:26:09 -0000 1.5
+++ gnulib/lib/stdint_.h 25 Jun 2007 21:16:32 -0000 1.6
@@ -16,14 +16,13 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _GL_STDINT_H
-#define _GL_STDINT_H
-
/*
* ISO C 99 <stdint.h> for platforms that lack it.
* <http://www.opengroup.org/susv3xbd/stdint.h.html>
*/
+#ifndef _GL_STDINT_H
+
/* Get those types that are already defined in other system include
files, so that we can "#define int8_t signed char" below without
worrying about a later system include file containing a "typedef
@@ -42,16 +41,20 @@
/* Other systems may have an incomplete or buggy <stdint.h>.
Include it before <inttypes.h>, since any "#include <stdint.h>"
in <inttypes.h> would reinclude us, skipping our contents because
- _GL_STDINT_H is defined. */
-# include @ABSOLUTE_STDINT_H@
+ _GL_STDINT_H is defined.
+ The include_next requires a split double-inclusion guard. */
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
#endif
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
+
/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
AIX 5.2 <sys/types.h> isn't needed and causes troubles.
MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
relies on the system <stdint.h> definitions, so include
- <sys/types.h> after @address@hidden */
+ <sys/types.h> after @address@hidden */
#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
# include <sys/types.h>
#endif
@@ -120,22 +123,34 @@
#define int32_t int
#define uint32_t unsigned int
-#undef int64_t
+/* Do not undefine int64_t if gnulib is not being used with 64-bit
+ types, since otherwise it breaks platforms like Tandem/NSK. */
#if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
# define int64_t long int
+# define GL_INT64_T
#elif defined _MSC_VER
+# undef int64_t
# define int64_t __int64
+# define GL_INT64_T
#elif @HAVE_LONG_LONG_INT@
+# undef int64_t
# define int64_t long long int
+# define GL_INT64_T
#endif
-#undef uint64_t
#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
# define uint64_t unsigned long int
+# define GL_UINT64_T
#elif defined _MSC_VER
+# undef uint64_t
# define uint64_t unsigned __int64
+# define GL_UINT64_T
#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# undef uint64_t
# define uint64_t unsigned long long int
+# define GL_UINT64_T
#endif
/* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */
@@ -164,10 +179,10 @@
#define uint_least16_t uint16_t
#define int_least32_t int32_t
#define uint_least32_t uint32_t
-#ifdef int64_t
+#ifdef GL_INT64_T
# define int_least64_t int64_t
#endif
-#ifdef uint64_t
+#ifdef GL_UINT64_T
# define uint_least64_t uint64_t
#endif
@@ -195,10 +210,10 @@
#define uint_fast16_t unsigned int_fast16_t
#define int_fast32_t long int
#define uint_fast32_t unsigned int_fast32_t
-#ifdef int64_t
+#ifdef GL_INT64_T
# define int_fast64_t int64_t
#endif
-#ifdef uint64_t
+#ifdef GL_UINT64_T
# define uint_fast64_t uint64_t
#endif
@@ -217,7 +232,7 @@
#undef intmax_t
#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
# define intmax_t long long int
-#elif defined int64_t
+#elif defined GL_INT64_T
# define intmax_t int64_t
#else
# define intmax_t long int
@@ -226,7 +241,7 @@
#undef uintmax_t
#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
# define uintmax_t unsigned long long int
-#elif defined uint64_t
+#elif defined GL_UINT64_T
# define uintmax_t uint64_t
#else
# define uintmax_t unsigned long int
@@ -264,13 +279,15 @@
#undef INT64_MIN
#undef INT64_MAX
-#ifdef int64_t
-# define INT64_MIN (~ INT64_MAX)
+#ifdef GL_INT64_T
+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+ evaluates the latter incorrectly in preprocessor expressions. */
+# define INT64_MIN (- INTMAX_C (1) << 63)
# define INT64_MAX INTMAX_C (9223372036854775807)
#endif
#undef UINT64_MAX
-#ifdef uint64_t
+#ifdef GL_UINT64_T
# define UINT64_MAX UINTMAX_C (18446744073709551615)
#endif
@@ -303,13 +320,13 @@
#undef INT_LEAST64_MIN
#undef INT_LEAST64_MAX
-#ifdef int64_t
+#ifdef GL_INT64_T
# define INT_LEAST64_MIN INT64_MIN
# define INT_LEAST64_MAX INT64_MAX
#endif
#undef UINT_LEAST64_MAX
-#ifdef uint64_t
+#ifdef GL_UINT64_T
# define UINT_LEAST64_MAX UINT64_MAX
#endif
@@ -342,13 +359,13 @@
#undef INT_FAST64_MIN
#undef INT_FAST64_MAX
-#ifdef int64_t
+#ifdef GL_INT64_T
# define INT_FAST64_MIN INT64_MIN
# define INT_FAST64_MAX INT64_MAX
#endif
#undef UINT_FAST64_MAX
-#ifdef uint64_t
+#ifdef GL_UINT64_T
# define UINT_FAST64_MAX UINT64_MAX
#endif
@@ -365,10 +382,11 @@
#undef INTMAX_MIN
#undef INTMAX_MAX
-#define INTMAX_MIN (~ INTMAX_MAX)
#ifdef INT64_MAX
+# define INTMAX_MIN INT64_MIN
# define INTMAX_MAX INT64_MAX
#else
+# define INTMAX_MIN INT32_MIN
# define INTMAX_MAX INT32_MAX
#endif
@@ -469,7 +487,7 @@
#undef INTMAX_C
#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
# define INTMAX_C(x) x##LL
-#elif defined int64_t
+#elif defined GL_INT64_T
# define INTMAX_C(x) INT64_C(x)
#else
# define INTMAX_C(x) x##L
@@ -478,7 +496,7 @@
#undef UINTMAX_C
#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
# define UINTMAX_C(x) x##ULL
-#elif defined uint64_t
+#elif defined GL_UINT64_T
# define UINTMAX_C(x) UINT64_C(x)
#else
# define UINTMAX_C(x) x##UL
@@ -487,3 +505,4 @@
#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
Index: gnulib/lib/stdlib_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/stdlib_.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/stdlib_.h 22 Feb 2007 00:46:10 -0000 1.1
+++ gnulib/lib/stdlib_.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -19,28 +19,18 @@
#if defined __need_malloc_and_calloc
/* Special invocation convention inside glibc header files. */
-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
- on which <stdlib.h> has an inappropriate declaration, see
- <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>. */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
-
-#include @ABSOLUTE_STDLIB_H@
address@hidden@ @NEXT_STDLIB_H@
#else
/* Normal invocation convention. */
+
#ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
- on which <stdlib.h> has an inappropriate declaration, see
- <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>. */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
+/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STDLIB_H@
-#include @ABSOLUTE_STDLIB_H@
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
/* The definition of GL_LINK_WARNING is copied here. */
@@ -50,8 +40,13 @@
#ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
#endif
+/* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
+ with proper operation of xargs. */
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
+#elif EXIT_FAILURE != 1
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
#endif
@@ -91,7 +86,7 @@
they are replaced with a string that makes the directory name unique.
Returns TEMPLATE, or a null pointer if it cannot get a unique name.
The directory is created mode 700. */
-extern char * mkdtemp (char *template);
+extern char * mkdtemp (char * /*template*/);
# endif
#elif defined GNULIB_POSIXCHECK
# undef mkdtemp
@@ -114,7 +109,10 @@
Returns the open file descriptor if successful, otherwise -1 and errno
set. */
# define mkstemp rpl_mkstemp
-extern int mkstemp (char *template);
+extern int mkstemp (char * /*template*/);
+# else
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
+# include <unistd.h>
# endif
#elif defined GNULIB_POSIXCHECK
# undef mkstemp
@@ -130,4 +128,5 @@
#endif
#endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
#endif
Index: gnulib/lib/strerror.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strerror.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/strerror.c 15 Oct 2006 21:09:15 -0000 1.2
+++ gnulib/lib/strerror.c 25 Jun 2007 21:16:32 -0000 1.3
@@ -1,6 +1,6 @@
/* strerror.c --- ANSI C compatible system error routine
- Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free
+ Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006, 2007 Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,8 @@
#include <config.h>
+#if !HAVE_STRERROR
+
#include <limits.h>
/* Don't include <stdio.h>, since it may or may not declare
@@ -45,3 +47,11 @@
else
return sys_errlist[n];
}
+
+#else
+
+/* This declaration is solely to ensure that after preprocessing
+ this file is never empty. */
+typedef int dummy;
+
+#endif
Index: gnulib/lib/string_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/string_.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/string_.h 22 Feb 2007 00:46:10 -0000 1.3
+++ gnulib/lib/string_.h 25 Jun 2007 21:16:32 -0000 1.4
@@ -17,15 +17,12 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _GL_STRING_H
-#define _GL_STRING_H
-/* This #pragma avoids a warning with "gcc -Wmissing-prototypes" on some
- mingw systems. */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
+/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STRING_H@
-#include @ABSOLUTE_STRING_H@
+#ifndef _GL_STRING_H
+#define _GL_STRING_H
/* The definition of GL_LINK_WARNING is copied here. */
@@ -192,9 +189,9 @@
# if ! @HAVE_STRNDUP@
# undef strndup
# define strndup rpl_strndup
-# if ! @HAVE_DECL_STRNDUP@
+# endif
+# if ! @HAVE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@
extern char *strndup (char const *__string, size_t __n);
-# endif
# endif
#elif defined GNULIB_POSIXCHECK
# undef strndup
@@ -400,6 +397,12 @@
extern size_t mbslen (const char *string);
#endif
+#if @GNULIB_MBSNLEN@
+/* Return the number of multibyte characters in the character string starting
+ at STRING and ending at STRING + LEN. */
+extern size_t mbsnlen (const char *string, size_t len);
+#endif
+
#if @GNULIB_MBSCHR@
/* Locate the first single-byte character C in the character string STRING,
and return a pointer to it. Return NULL if C is not found in STRING.
@@ -541,4 +544,5 @@
}
#endif
-#endif
+#endif /* _GL_STRING_H */
+#endif /* _GL_STRING_H */
Index: gnulib/lib/sys_time_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/sys_time_.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/sys_time_.h 5 Feb 2007 16:26:09 -0000 1.1
+++ gnulib/lib/sys_time_.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -18,15 +18,18 @@
/* Written by Paul Eggert. */
-#ifndef _gl_SYS_TIME_H
-#define _gl_SYS_TIME_H
+#ifndef _GL_SYS_TIME_H
+/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_TIME_H@
-# include @ABSOLUTE_SYS_TIME_H@
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
#else
# include <time.h>
#endif
+#ifndef _GL_SYS_TIME_H
+#define _GL_SYS_TIME_H
+
#if ! @HAVE_STRUCT_TIMEVAL@
struct timeval
{
@@ -35,10 +38,11 @@
};
#endif
-#if @GETTIMEOFDAY_REPLACEMENT@
+#if @REPLACE_GETTIMEOFDAY@
# undef gettimeofday
# define gettimeofday rpl_gettimeofday
int gettimeofday (struct timeval *restrict, void *restrict);
#endif
-#endif /* _gl_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */
+#endif /* _GL_SYS_TIME_H */
Index: gnulib/lib/unistd_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/unistd_.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/unistd_.h 22 Feb 2007 00:46:10 -0000 1.2
+++ gnulib/lib/unistd_.h 25 Jun 2007 21:16:32 -0000 1.3
@@ -16,12 +16,22 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _GL_UNISTD_H
-#define _GL_UNISTD_H
+/* The include_next requires a split double-inclusion guard. */
#if @HAVE_UNISTD_H@
-# include @ABSOLUTE_UNISTD_H@
+# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
#endif
+#ifndef _GL_UNISTD_H
+#define _GL_UNISTD_H
+
+/* mingw doesn't define the SEEK_* macros in <unistd.h>. */
+#if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET)
+# include <stdio.h>
+#endif
+
+/* mingw fails to declare _exit in <unistd.h>. */
+#include <stdlib.h>
/* The definition of GL_LINK_WARNING is copied here. */
@@ -35,13 +45,18 @@
#if @GNULIB_CHOWN@
# if @REPLACE_CHOWN@
+# ifndef REPLACE_CHOWN
+# define REPLACE_CHOWN 1
+# endif
+# if REPLACE_CHOWN
/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
- to GID (if GID is not -1).
+ to GID (if GID is not -1). Follow symbolic links.
Return 0 if successful, otherwise -1 and errno set.
See the POSIX:2001 specification
<http://www.opengroup.org/susv3xsh/chown.html>. */
-# define chown rpl_chown
+# define chown rpl_chown
extern int chown (const char *file, uid_t uid, gid_t gid);
+# endif
# endif
#elif defined GNULIB_POSIXCHECK
# undef chown
@@ -165,6 +180,43 @@
#endif
+#if @GNULIB_LCHOWN@
+# if @REPLACE_LCHOWN@
+/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
+ to GID (if GID is not -1). Do not follow symbolic links.
+ Return 0 if successful, otherwise -1 and errno set.
+ See the POSIX:2001 specification
+ <http://www.opengroup.org/susv3xsh/lchown.html>. */
+# define lchown rpl_lchown
+extern int lchown (char const *file, uid_t owner, gid_t group);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef lchown
+# define lchown(f,u,g) \
+ (GL_LINK_WARNING ("lchown is unportable to pre-POSIX.1-2001 " \
+ "systems - use gnulib module lchown for portability"), \
+ lchown (f, u, g))
+#endif
+
+
+#if @GNULIB_LSEEK@
+# if @REPLACE_LSEEK@
+/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
+ Return the new offset if successful, otherwise -1 and errno set.
+ See the POSIX:2001 specification
+ <http://www.opengroup.org/susv3xsh/lseek.html>. */
+# define lseek rpl_lseek
+ extern off_t lseek (int fd, off_t offset, int whence);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef lseek
+# define lseek(f,o,w) \
+ (GL_LINK_WARNING ("lseek does not fail with ESPIPE on pipes on some " \
+ "systems - use gnulib module lseek for portability"), \
+ lseek (f, o, w))
+#endif
+
+
#if @GNULIB_READLINK@
/* Read the contents of the symbolic link FILE and place the first BUFSIZE
bytes of it into BUF. Return the number of bytes placed into BUF if
@@ -184,9 +236,27 @@
#endif
+#if @GNULIB_SLEEP@
+/* Pause the execution of the current thread for N seconds.
+ Returns the number of seconds left to sleep.
+ See the POSIX:2001 specification
+ <http://www.opengroup.org/susv3xsh/sleep.html>. */
+# if address@hidden@
+extern unsigned int sleep (unsigned int n);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef sleep
+# define sleep(n) \
+ (GL_LINK_WARNING ("sleep is unportable - " \
+ "use gnulib module sleep for portability"), \
+ sleep (n))
+#endif
+
+
#ifdef __cplusplus
}
#endif
#endif /* _GL_UNISTD_H */
+#endif /* _GL_UNISTD_H */
Index: gnulib/lib/wchar_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/wchar_.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/wchar_.h 5 Feb 2007 16:26:09 -0000 1.1
+++ gnulib/lib/wchar_.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -26,7 +26,6 @@
*/
#ifndef _GL_WCHAR_H
-#define _GL_WCHAR_H
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
@@ -36,7 +35,15 @@
#include <stdio.h>
#include <time.h>
-/* Include the original <wchar.h>. */
-#include @ABSOLUTE_WCHAR_H@
+/* Include the original <wchar.h> if it exists.
+ Some builds of uClibc lack it. */
+/* The include_next requires a split double-inclusion guard. */
+#if @HAVE_WCHAR_H@
+# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+#endif
+
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
Index: gnulib/lib/wctype_.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/wctype_.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/wctype_.h 11 Jan 2007 19:23:33 -0000 1.2
+++ gnulib/lib/wctype_.h 25 Jun 2007 21:16:32 -0000 1.3
@@ -27,7 +27,6 @@
*/
#ifndef _GL_WCTYPE_H
-#define _GL_WCTYPE_H
#if @HAVE_WINT_T@
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
@@ -39,20 +38,27 @@
# include <stdio.h>
# include <time.h>
# include <wchar.h>
-typedef wint_t __wctype_wint_t;
-#else
-typedef int __wctype_wint_t;
#endif
/* Include the original <wctype.h> if it exists.
BeOS 5 has the functions but no <wctype.h>. */
+/* The include_next requires a split double-inclusion guard. */
#if @HAVE_WCTYPE_H@
-# include @ABSOLUTE_WCTYPE_H@
+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+#endif
+
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
+
+#if @HAVE_WINT_T@
+typedef wint_t __wctype_wint_t;
+#else
+typedef int __wctype_wint_t;
#endif
/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
Assume all 12 functions are implemented the same way, or not at all. */
-#if ! HAVE_ISWCNTRL
+#if ! @HAVE_ISWCNTRL@
/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
@@ -152,3 +158,4 @@
# endif /* ! HAVE_ISWCNTRL */
#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
Index: gnulib/lib/xsetenv.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xsetenv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/xsetenv.h 19 Jun 2006 23:08:57 -0000 1.1
+++ gnulib/lib/xsetenv.h 25 Jun 2007 21:16:32 -0000 1.2
@@ -1,5 +1,5 @@
/* Setting environment variables, with out-of-memory checking.
- Copyright (C) 2001-2002 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2007 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
@@ -18,7 +18,7 @@
/* Get unsetenv(). It can be used without error checking. */
#include "setenv.h"
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -27,6 +27,6 @@
With error checking. */
extern void xsetenv (const char *name, const char *value, int replace);
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
Index: gnulib/m4/absolute-header.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/absolute-header.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/absolute-header.m4 12 Aug 2006 12:57:17 -0000 1.1
+++ gnulib/m4/absolute-header.m4 25 Jun 2007 21:16:32 -0000 1.2
@@ -1,5 +1,5 @@
-# absolute-header.m4 serial 6
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# absolute-header.m4 serial 7
+dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -32,7 +32,12 @@
dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell.
AS_VAR_SET(gl_absolute_header,
[`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-sed -n
'\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#;s#^/[^/]#//&#;p;q;}'`])
+sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
+ s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
+ s#^/[^/]#//&#
+ p
+ q
+}'`])
fi
AS_VAR_POPDEF([ac_header_exists])dnl
])dnl
Index: gnulib/m4/gettext.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gettext.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/m4/gettext.m4 27 Nov 2006 15:14:10 -0000 1.5
+++ gnulib/m4/gettext.m4 25 Jun 2007 21:16:32 -0000 1.6
@@ -1,4 +1,4 @@
-# gettext.m4 serial 59 (gettext-0.16.1)
+# gettext.m4 serial 59a (gettext-0.16.1)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -362,44 +362,6 @@
])
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
- dnl Check for API introduced in MacOS X 10.2.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- gt_cv_func_CFPreferencesCopyAppValue,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
- [CFPreferencesCopyAppValue(NULL, NULL)],
- [gt_cv_func_CFPreferencesCopyAppValue=yes],
- [gt_cv_func_CFPreferencesCopyAppValue=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
- fi
- dnl Check for API introduced in MacOS X 10.3.
- AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>],
[CFLocaleCopyCurrent();],
- [gt_cv_func_CFLocaleCopyCurrent=yes],
- [gt_cv_func_CFLocaleCopyCurrent=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-
dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
m4_define([gt_NEEDS_INIT],
[
Index: gnulib/m4/gettimeofday.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gettimeofday.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/gettimeofday.m4 5 Feb 2007 16:26:09 -0000 1.1
+++ gnulib/m4/gettimeofday.m4 25 Jun 2007 21:16:32 -0000 1.2
@@ -31,7 +31,7 @@
gl_FUNC_GETTIMEOFDAY_CLOBBER
if test $gl_cv_func_gettimeofday_posix_signature != yes; then
- GETTIMEOFDAY_REPLACEMENT=1
+ REPLACE_GETTIMEOFDAY=1
SYS_TIME_H=sys/time.h
if test $gl_cv_func_gettimeofday_clobber != yes; then
AC_LIBOBJ(gettimeofday)
@@ -77,7 +77,7 @@
[gl_cv_func_gettimeofday_clobber=yes])])
if test $gl_cv_func_gettimeofday_clobber = yes; then
- GETTIMEOFDAY_REPLACEMENT=1
+ REPLACE_GETTIMEOFDAY=1
SYS_TIME_H=sys/time.h
gl_GETTIMEOFDAY_REPLACE_LOCALTIME
AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1,
Index: gnulib/m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnulib/m4/gnulib-comp.m4 22 Feb 2007 00:46:10 -0000 1.13
+++ gnulib/m4/gnulib-comp.m4 25 Jun 2007 21:16:33 -0000 1.14
@@ -42,20 +42,23 @@
gl_ltlibdeps=
gl_source_base='gnulib/lib'
gl_FUNC_ALLOCA
- gl_ALLOCSA
gl_ERROR
gl_EXITFAIL
gl_GETOPT
dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
- AM_GNU_GETTEXT_VERSION([0.15])
+ AM_GNU_GETTEXT_VERSION([0.16.1])
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
gl_FUNC_GETTIMEOFDAY
gl_INLINE
+ gl_MALLOCA
gl_MBSWIDTH
gl_FUNC_MEMCPY
gl_FUNC_MEMMOVE
gl_FUNC_MKSTEMP
gl_STDLIB_MODULE_INDICATOR([mkstemp])
- gt_FUNC_SETENV
+ gl_FUNC_SETENV
+ gl_FUNC_UNSETENV
gl_STDINT_H
gl_STDLIB_H
gl_STRCASE
@@ -117,9 +120,6 @@
build-aux/config.rpath
build-aux/link-warning.h
lib/alloca_.h
- lib/allocsa.c
- lib/allocsa.h
- lib/allocsa.valgrind
lib/error.c
lib/error.h
lib/exitfail.c
@@ -130,6 +130,9 @@
lib/getopt_int.h
lib/gettext.h
lib/gettimeofday.c
+ lib/malloca.c
+ lib/malloca.h
+ lib/malloca.valgrind
lib/mbswidth.c
lib/mbswidth.h
lib/memcpy.c
@@ -137,7 +140,6 @@
lib/mkstemp.c
lib/setenv.c
lib/setenv.h
- lib/stat_.h
lib/stdint_.h
lib/stdlib_.h
lib/strcasecmp.c
@@ -145,6 +147,7 @@
lib/strerror.c
lib/string_.h
lib/strncasecmp.c
+ lib/sys_stat_.h
lib/sys_time_.h
lib/tempname.c
lib/tempname.h
@@ -160,7 +163,6 @@
lib/xsetenv.h
m4/absolute-header.m4
m4/alloca.m4
- m4/allocsa.m4
m4/codeset.m4
m4/eealloc.m4
m4/error.m4
@@ -173,10 +175,12 @@
m4/glibc21.m4
m4/gnulib-common.m4
m4/iconv.m4
+ m4/include_next.m4
m4/inline.m4
m4/intdiv0.m4
m4/intl.m4
m4/intldir.m4
+ m4/intlmacosx.m4
m4/intmax.m4
m4/inttypes-pri.m4
m4/inttypes_h.m4
@@ -185,8 +189,8 @@
m4/lib-link.m4
m4/lib-prefix.m4
m4/lock.m4
- m4/longdouble.m4
m4/longlong.m4
+ m4/malloca.m4
m4/mbrtowc.m4
m4/mbstate_t.m4
m4/mbswidth.m4
Index: gnulib/m4/iconv.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/iconv.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/iconv.m4 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/m4/iconv.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,5 +1,5 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# iconv.m4 serial AM6 (gettext-0.16.2)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -21,6 +21,7 @@
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
@@ -33,7 +34,7 @@
am_save_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
- AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+ AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
@@ -56,7 +57,85 @@
fi
])
if test "$am_cv_func_iconv" = yes; then
- AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+ dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne
Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ LIBS="$am_save_LIBS"
+ ])
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+ AC_DEFINE(HAVE_ICONV, 1,
+ [Define if you have the iconv() function and it works.])
fi
if test "$am_cv_lib_iconv" = yes; then
AC_MSG_CHECKING([how to link with libiconv])
Index: gnulib/m4/intdiv0.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/intdiv0.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/intdiv0.m4 22 Feb 2007 00:46:10 -0000 1.2
+++ gnulib/m4/intdiv0.m4 25 Jun 2007 21:16:33 -0000 1.3
@@ -14,7 +14,22 @@
AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
gt_cv_int_divbyzero_sigfpe,
[
- AC_TRY_RUN([
+ gt_cv_int_divbyzero_sigfpe=
+changequote(,)dnl
+ case "$host_os" in
+ macos* | darwin[6-9]* | darwin[1-9][0-9]*)
+ # On MacOS X 10.2 or newer, just assume the same as when cross-
+ # compiling. If we were to perform the real test, 1 Crash Report
+ # dialog window would pop up.
+ case "$host_cpu" in
+ i[34567]86 | x86_64)
+ gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
+ esac
+ ;;
+ esac
+changequote([,])dnl
+ if test -z "$gt_cv_int_divbyzero_sigfpe"; then
+ AC_TRY_RUN([
#include <stdlib.h>
#include <signal.h>
@@ -47,17 +62,18 @@
exit (1);
}
], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
- [
- # Guess based on the CPU.
+ [
+ # Guess based on the CPU.
changequote(,)dnl
- case "$host_cpu" in
- alpha* | i[34567]86 | m68k | s390*)
- gt_cv_int_divbyzero_sigfpe="guessing yes";;
- *)
- gt_cv_int_divbyzero_sigfpe="guessing no";;
- esac
+ case "$host_cpu" in
+ alpha* | i[34567]86 | x86_64 | m68k | s390*)
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
+ *)
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
+ esac
changequote([,])dnl
- ])
+ ])
+ fi
])
case "$gt_cv_int_divbyzero_sigfpe" in
*yes) value=1;;
Index: gnulib/m4/intl.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/intl.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/intl.m4 31 Oct 2006 19:34:00 -0000 1.1
+++ gnulib/m4/intl.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,5 +1,5 @@
-# intl.m4 serial 3 (gettext-0.16)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# intl.m4 serial 5 (gettext-0.16.2)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,6 @@
AC_REQUIRE([gl_VISIBILITY])dnl
AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
AC_REQUIRE([gt_TYPE_WINT_T])dnl
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
@@ -107,6 +106,19 @@
WOE32DLL=$is_woe32dll
AC_SUBST([WOE32DLL])
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+ mingw* | cygwin*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ WOE32=$is_woe32
+ AC_SUBST([WOE32])
+ if test $WOE32 = yes; then
+ dnl Check for a program that compiles Windows resource files.
+ AC_CHECK_TOOL([WINDRES], [windres])
+ fi
+
dnl Rename some macros and functions used for locking.
AH_BOTTOM([
#define __libc_lock_t gl_lock_t
Index: gnulib/m4/printf-posix.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/printf-posix.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/printf-posix.m4 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/m4/printf-posix.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,5 +1,5 @@
-# printf-posix.m4 serial 2 (gettext-0.13.1)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# printf-posix.m4 serial 3 (gettext-0.16.2)
+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -28,7 +28,7 @@
}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
[
AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined
__CYGWIN__
+#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined
__MINGW32__ || defined __CYGWIN__
notposix
#endif
], gt_cv_func_printf_posix="guessing no",
Index: gnulib/m4/setenv.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/setenv.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/setenv.m4 19 Jun 2006 23:08:57 -0000 1.1
+++ gnulib/m4/setenv.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,16 +1,30 @@
-# setenv.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+# setenv.m4 serial 8
+dnl Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-AC_DEFUN([gt_FUNC_SETENV],
+AC_DEFUN([gl_FUNC_SETENV],
[
- AC_REPLACE_FUNCS(setenv unsetenv)
+ AC_CHECK_FUNCS_ONCE([setenv])
if test $ac_cv_func_setenv = no; then
+ AC_LIBOBJ([setenv])
gl_PREREQ_SETENV
fi
+])
+
+# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
+[
+ AC_CHECK_FUNCS_ONCE([setenv])
+ gl_PREREQ_SETENV
+])
+
+AC_DEFUN([gl_FUNC_UNSETENV],
+[
+ AC_CHECK_FUNCS([unsetenv])
if test $ac_cv_func_unsetenv = no; then
+ AC_LIBOBJ([unsetenv])
gl_PREREQ_UNSETENV
else
AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret,
Index: gnulib/m4/stdint.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdint.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/m4/stdint.m4 5 Feb 2007 16:26:09 -0000 1.4
+++ gnulib/m4/stdint.m4 25 Jun 2007 21:16:33 -0000 1.5
@@ -1,5 +1,5 @@
-# stdint.m4 serial 22
-dnl Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc.
+# stdint.m4 serial 27
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -45,32 +45,26 @@
fi
AC_SUBST([HAVE_SYS_TYPES_H])
- dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_stdint_h.
+ gl_CHECK_NEXT_HEADERS([stdint.h])
if test $ac_cv_header_stdint_h = yes; then
- gl_ABSOLUTE_HEADER([stdint.h])
- ABSOLUTE_STDINT_H=\"$gl_cv_absolute_stdint_h\"
HAVE_STDINT_H=1
else
- ABSOLUTE_STDINT_H=\"no/such/file/stdint.h\"
HAVE_STDINT_H=0
fi
- AC_SUBST([ABSOLUTE_STDINT_H])
AC_SUBST([HAVE_STDINT_H])
- dnl Now see whether we need a substitute <stdint.h>. Use
- dnl ABSOLUTE_STDINT_H, not <stdint.h>, so that it also works during
- dnl a "config.status --recheck" if a stdint.h has been
- dnl created in the build directory.
+ dnl Now see whether we need a substitute <stdint.h>.
if test $ac_cv_header_stdint_h = yes; then
AC_CACHE_CHECK([whether stdint.h conforms to C99],
[gl_cv_header_working_stdint_h],
[gl_cv_header_working_stdint_h=no
AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-#include <stddef.h>
+ AC_LANG_PROGRAM([gl_STDINT_INCLUDES
+ [
#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-#include ABSOLUTE_STDINT_H
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
#ifdef INT8_MAX
int8_t a1 = INT8_MAX;
int8_t a1min = INT8_MIN;
@@ -142,12 +136,32 @@
#endif
intmax_t i = INTMAX_MAX;
uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+ ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+ ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
struct s {
- int check_PTRDIFF: PTRDIFF_MIN < 0 && 0 < PTRDIFF_MAX ? 1 : -1;
- int check_SIG_ATOMIC: SIG_ATOMIC_MIN <= 0 && 0 < SIG_ATOMIC_MAX ? 1 : -1;
- int check_SIZE: 0 < SIZE_MAX ? 1 : -1;
- int check_WCHAR: WCHAR_MIN <= 0 && 0 < WCHAR_MAX ? 1 : -1;
- int check_WINT: WINT_MIN <= 0 && 0 < WINT_MAX ? 1 : -1;
+ int check_PTRDIFF:
+ PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+ && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+ ? 1 : -1;
+ /* Detect bug in FreeBSD 6.0 / ia64. */
+ int check_SIG_ATOMIC:
+ SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+ && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+ ? 1 : -1;
+ int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+ int check_WCHAR:
+ WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+ && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+ ? 1 : -1;
+ /* Detect bug in mingw. */
+ int check_WINT:
+ WINT_MIN == TYPE_MINIMUM (wint_t)
+ && WINT_MAX == TYPE_MAXIMUM (wint_t)
+ ? 1 : -1;
/* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */
int check_UINT8_C:
@@ -202,6 +216,10 @@
fi
AC_SUBST([HAVE_SYS_BITYPES_H])
+ dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+ dnl character support).
+ AC_CHECK_HEADERS_ONCE([wchar.h])
+
gl_STDINT_TYPE_PROPERTIES
STDINT_H=stdint.h
fi
@@ -337,9 +355,11 @@
included before <wchar.h>. */
#include <stddef.h>
#include <signal.h>
- #include <stdio.h>
- #include <time.h>
- #include <wchar.h>
+ #if HAVE_WCHAR_H
+ # include <stdio.h>
+ # include <time.h>
+ # include <wchar.h>
+ #endif
]])
dnl gl_STDINT_TYPE_PROPERTIES
Index: gnulib/m4/stdlib_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdlib_h.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/stdlib_h.m4 22 Feb 2007 00:46:10 -0000 1.1
+++ gnulib/m4/stdlib_h.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 1
+# stdlib_h.m4 serial 2
dnl Copyright (C) 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,9 +7,7 @@
AC_DEFUN([gl_STDLIB_H],
[
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
- gl_ABSOLUTE_HEADER([stdlib.h])
- ABSOLUTE_STDLIB_H=\"$gl_cv_absolute_stdlib_h\"
- AC_SUBST([ABSOLUTE_STDLIB_H])
+ gl_CHECK_NEXT_HEADERS([stdlib.h])
])
AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
Index: gnulib/m4/strerror.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/strerror.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/strerror.m4 18 Jun 2006 23:39:43 -0000 1.1
+++ gnulib/m4/strerror.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -1,17 +1,25 @@
-# strerror.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strerror.m4 serial 3
+dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_STRERROR],
[
- AC_REPLACE_FUNCS(strerror)
+ AC_CHECK_FUNCS_ONCE([strerror])
if test $ac_cv_func_strerror = no; then
+ AC_LIBOBJ([strerror])
gl_PREREQ_STRERROR
fi
])
+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no
AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
+[
+ AC_CHECK_FUNCS_ONCE([strerror])
+ gl_PREREQ_STRERROR
+])
+
# Prerequisites of lib/strerror.c.
AC_DEFUN([gl_PREREQ_STRERROR], [
:
Index: gnulib/m4/string_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/string_h.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/string_h.m4 22 Feb 2007 00:46:10 -0000 1.3
+++ gnulib/m4/string_h.m4 25 Jun 2007 21:16:33 -0000 1.4
@@ -18,9 +18,7 @@
[
AC_REQUIRE([AC_C_RESTRICT])
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
- gl_ABSOLUTE_HEADER([string.h])
- ABSOLUTE_STRING_H=\"$gl_cv_absolute_string_h\"
- AC_SUBST([ABSOLUTE_STRING_H])
+ gl_CHECK_NEXT_HEADERS([string.h])
])
AC_DEFUN([gl_STRING_MODULE_INDICATOR],
@@ -46,6 +44,7 @@
GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR])
GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R])
GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN])
+ GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN])
GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR])
GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR])
GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR])
Index: gnulib/m4/sys_stat_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/sys_stat_h.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/sys_stat_h.m4 31 Oct 2006 19:34:00 -0000 1.3
+++ gnulib/m4/sys_stat_h.m4 25 Jun 2007 21:16:33 -0000 1.4
@@ -1,5 +1,5 @@
-# sys_stat_h.m4 serial 4 -*- Autoconf -*-
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# sys_stat_h.m4 serial 6 -*- Autoconf -*-
+dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -12,6 +12,12 @@
dnl Check for lstat. Systems that lack it (mingw) also lack symlinks, so
dnl stat is a good replacement.
AC_CHECK_FUNCS_ONCE([lstat])
+ if test $ac_cv_func_lstat = yes; then
+ HAVE_LSTAT=1
+ else
+ HAVE_LSTAT=0
+ fi
+ AC_SUBST([HAVE_LSTAT])
dnl Check for mkdir. Mingw has _mkdir(name) in the nonstandard <io.h>
dnl instead.
@@ -19,14 +25,24 @@
[],
[AC_CHECK_HEADERS([io.h])],
[#include <sys/stat.h>])
+ if test $ac_cv_have_decl_mkdir = yes; then
+ HAVE_DECL_MKDIR=1
+ else
+ HAVE_DECL_MKDIR=0
+ fi
+ AC_SUBST([HAVE_DECL_MKDIR])
+ if test "$ac_cv_header_io_h" = yes; then
+ HAVE_IO_H=1
+ else
+ HAVE_IO_H=0
+ fi
+ AC_SUBST([HAVE_IO_H])
AC_REQUIRE([AC_C_INLINE])
dnl Check for broken stat macros.
AC_REQUIRE([AC_HEADER_STAT])
- gl_ABSOLUTE_HEADER([sys/stat.h])
- ABSOLUTE_SYS_STAT_H=\"$gl_cv_absolute_sys_stat_h\"
- AC_SUBST([ABSOLUTE_SYS_STAT_H])
+ gl_CHECK_NEXT_HEADERS([sys/stat.h])
SYS_STAT_H='sys/stat.h'
AC_SUBST([SYS_STAT_H])
]) # gl_HEADER_SYS_STAT_H
Index: gnulib/m4/sys_time_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/sys_time_h.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/sys_time_h.m4 5 Feb 2007 16:26:09 -0000 1.1
+++ gnulib/m4/sys_time_h.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -9,8 +9,8 @@
AC_DEFUN([gl_HEADER_SYS_TIME_H],
[
- dnl Use AC_REQUIRE here, so that the GETTIMEOFDAY_REPLACEMENT=0 statement
- dnl below is expanded once only, before all GETTIMEOFDAY_REPLACEMENT=1
+ dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
+ dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
dnl statements that occur in other macros.
AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
])
@@ -18,17 +18,13 @@
AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
[
AC_REQUIRE([AC_C_RESTRICT])
- AC_CHECK_HEADERS_ONCE([sys/time.h])
+ gl_CHECK_NEXT_HEADERS([sys/time.h])
if test $ac_cv_header_sys_time_h = yes; then
- gl_ABSOLUTE_HEADER([sys/time.h])
- ABSOLUTE_SYS_TIME_H=\"$gl_cv_absolute_sys_time_h\"
HAVE_SYS_TIME_H=1
else
- ABSOLUTE_SYS_TIME_H=\"no/such/file/sys/time.h\"
HAVE_SYS_TIME_H=0
fi
- AC_SUBST([ABSOLUTE_SYS_TIME_H])
AC_SUBST([HAVE_SYS_TIME_H])
AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
@@ -50,8 +46,8 @@
AC_SUBST([HAVE_STRUCT_TIMEVAL])
dnl Assume POSIX behavior unless another module says otherwise.
- GETTIMEOFDAY_REPLACEMENT=0
- AC_SUBST([GETTIMEOFDAY_REPLACEMENT])
+ REPLACE_GETTIMEOFDAY=0
+ AC_SUBST([REPLACE_GETTIMEOFDAY])
if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then
SYS_TIME_H=sys/time.h
else
Index: gnulib/m4/unistd_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/unistd_h.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/unistd_h.m4 22 Feb 2007 00:46:10 -0000 1.3
+++ gnulib/m4/unistd_h.m4 25 Jun 2007 21:16:33 -0000 1.4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 5
+# unistd_h.m4 serial 9
dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,16 +12,15 @@
dnl once only, before all statements that occur in other macros.
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+ gl_CHECK_NEXT_HEADERS([unistd.h])
+
AC_CHECK_HEADERS_ONCE([unistd.h])
if test $ac_cv_header_unistd_h = yes; then
HAVE_UNISTD_H=1
- gl_ABSOLUTE_HEADER([unistd.h])
- ABSOLUTE_UNISTD_H=\"$gl_cv_absolute_unistd_h\"
else
HAVE_UNISTD_H=0
fi
AC_SUBST([HAVE_UNISTD_H])
- AC_SUBST([ABSOLUTE_UNISTD_H])
])
AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -39,13 +38,19 @@
GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE])
GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD])
GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R])
+ GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN])
+ GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK])
GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK])
+ GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_DUP2=1; AC_SUBST([HAVE_DUP2])
HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE])
HAVE_READLINK=1; AC_SUBST([HAVE_READLINK])
+ HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP])
HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN])
REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR])
REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD])
+ REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN])
+ REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK])
])
Index: gnulib/m4/wchar.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/wchar.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/wchar.m4 5 Feb 2007 16:26:09 -0000 1.1
+++ gnulib/m4/wchar.m4 25 Jun 2007 21:16:33 -0000 1.2
@@ -7,7 +7,7 @@
dnl Written by Eric Blake.
-# wchar.m4 serial 1
+# wchar.m4 serial 3
AC_DEFUN([gl_WCHAR_H],
[
@@ -20,10 +20,17 @@
if test $gl_cv_header_wchar_h_standalone = yes; then
WCHAR_H=
else
- gl_ABSOLUTE_HEADER([wchar.h])
- ABSOLUTE_WCHAR_H=\"$gl_cv_absolute_wchar_h\"
+ dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+ dnl character support).
+ AC_CHECK_HEADERS_ONCE([wchar.h])
+ if test $ac_cv_header_wchar_h = yes; then
+ HAVE_WCHAR_H=1
+ else
+ HAVE_WCHAR_H=0
+ fi
+ AC_SUBST([HAVE_WCHAR_H])
+ gl_CHECK_NEXT_HEADERS([wchar.h])
WCHAR_H=wchar.h
fi
- AC_SUBST([ABSOLUTE_WCHAR_H])
AC_SUBST([WCHAR_H])
])
Index: gnulib/m4/wctype.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/wctype.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/wctype.m4 11 Jan 2007 19:23:33 -0000 1.2
+++ gnulib/m4/wctype.m4 25 Jun 2007 21:16:34 -0000 1.3
@@ -10,6 +10,12 @@
AC_DEFUN([gl_WCTYPE_H],
[
AC_CHECK_FUNCS_ONCE([iswcntrl])
+ if test $ac_cv_func_iswcntrl = yes; then
+ HAVE_ISWCNTRL=1
+ else
+ HAVE_ISWCNTRL=0
+ fi
+ AC_SUBST([HAVE_ISWCNTRL])
AC_CHECK_HEADERS_ONCE([wctype.h])
AC_REQUIRE([AC_C_INLINE])
@@ -23,19 +29,16 @@
WCTYPE_H=wctype.h
if test $ac_cv_header_wctype_h = yes; then
- if test "$ac_cv_func_iswcntrl" = yes; then
+ if test $ac_cv_func_iswcntrl = yes; then
WCTYPE_H=
fi
- dnl Compute ABSOLUTE_WCTYPE_H even if WCTYPE_H is empty,
+ dnl Compute NEXT_WCTYPE_H even if WCTYPE_H is empty,
dnl for the benefit of builds from non-distclean directories.
- gl_ABSOLUTE_HEADER([wctype.h])
- ABSOLUTE_WCTYPE_H=\"$gl_cv_absolute_wctype_h\"
+ gl_CHECK_NEXT_HEADERS([wctype.h])
HAVE_WCTYPE_H=1
else
- ABSOLUTE_WCTYPE_H=\"no/such/file/wctype.h\"
HAVE_WCTYPE_H=0
fi
- AC_SUBST([ABSOLUTE_WCTYPE_H])
AC_SUBST([HAVE_WCTYPE_H])
AC_SUBST([WCTYPE_H])
])
Index: gnulib/m4/wint_t.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/wint_t.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/wint_t.m4 11 Jan 2007 19:23:33 -0000 1.2
+++ gnulib/m4/wint_t.m4 25 Jun 2007 21:16:34 -0000 1.3
@@ -1,4 +1,4 @@
-# wint_t.m4 serial 2 (gettext-0.12)
+# wint_t.m4 serial 2 (gettext-0.16.2)
dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
P gnulib/lib/.cvsignore
P gnulib/lib/Makefile.am
P gnulib/lib/alloca_.h
P gnulib/lib/getopt_.h
P gnulib/lib/mbswidth.h
P gnulib/lib/setenv.c
P gnulib/lib/setenv.h
P gnulib/lib/stdint_.h
P gnulib/lib/stdlib_.h
P gnulib/lib/strerror.c
P gnulib/lib/string_.h
P gnulib/lib/sys_time_.h
P gnulib/lib/unistd_.h
P gnulib/lib/wchar_.h
P gnulib/lib/wctype_.h
P gnulib/lib/xsetenv.h
U gnulib/m4/.cvsignore
P gnulib/m4/absolute-header.m4
P gnulib/m4/gettext.m4
P gnulib/m4/gettimeofday.m4
P gnulib/m4/gnulib-comp.m4
P gnulib/m4/iconv.m4
P gnulib/m4/intdiv0.m4
P gnulib/m4/intl.m4
P gnulib/m4/printf-posix.m4
P gnulib/m4/setenv.m4
P gnulib/m4/stdint.m4
P gnulib/m4/stdlib_h.m4
P gnulib/m4/strerror.m4
P gnulib/m4/string_h.m4
P gnulib/m4/sys_stat_h.m4
P gnulib/m4/sys_time_h.m4
P gnulib/m4/unistd_h.m4
P gnulib/m4/wchar.m4
P gnulib/m4/wctype.m4
P gnulib/m4/wint_t.m4
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Jun 25 17:23:01 EDT 2007),
Karl Berry <=