[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Fri Dec 28 10:23:01 EST 2007)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Fri Dec 28 10:23:01 EST 2007) |
|
Date: |
Fri, 28 Dec 2007 10:23:03 -0500 |
Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnulib/lib/Makefile.am 24 Dec 2007 00:24:06 -0000 1.22
+++ gnulib/lib/Makefile.am 28 Dec 2007 14:59:12 -0000 1.23
@@ -352,9 +352,9 @@
## begin gnulib module setenv
-EXTRA_DIST += setenv.c setenv.h unsetenv.c
+EXTRA_DIST += setenv.c
-EXTRA_libgnu_a_SOURCES += setenv.c unsetenv.c
+EXTRA_libgnu_a_SOURCES += setenv.c
## end gnulib module setenv
@@ -434,13 +434,18 @@
-e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
-e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
-e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
-e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
-e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
-e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
+ -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
+ -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+ -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/stdlib.in.h; \
} > address@hidden
@@ -640,6 +645,7 @@
-e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
-e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
-e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
-e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
< $(srcdir)/unistd.in.h; \
@@ -673,6 +679,15 @@
## end gnulib module uniwidth/width
+## begin gnulib module unsetenv
+
+
+EXTRA_DIST += unsetenv.c
+
+EXTRA_libgnu_a_SOURCES += unsetenv.c
+
+## end gnulib module unsetenv
+
## begin gnulib module wchar
BUILT_SOURCES += $(WCHAR_H)
Index: gnulib/lib/setenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/setenv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/lib/setenv.c 26 Nov 2007 19:12:40 -0000 1.5
+++ gnulib/lib/setenv.c 28 Dec 2007 14:59:12 -0000 1.6
@@ -19,12 +19,14 @@
#endif
#include <alloca.h>
+/* Specification. */
+#include <stdlib.h>
+
#include <errno.h>
#ifndef __set_errno
# define __set_errno(ev) ((errno) = (ev))
#endif
-#include <stdlib.h>
#include <string.h>
#if _LIBC || HAVE_UNISTD_H
# include <unistd.h>
cvs diff: Tag HEAD refers to a dead (removed) revision in file
`gnulib/lib/setenv.h'.
cvs diff: No comparison available. Pass `-N' to `cvs diff'?
Index: gnulib/lib/stdlib.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/stdlib.in.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/stdlib.in.h 26 Dec 2007 00:53:46 -0000 1.1
+++ gnulib/lib/stdlib.in.h 28 Dec 2007 14:59:13 -0000 1.2
@@ -1,6 +1,6 @@
/* A GNU-like <stdlib.h>.
- Copyright (C) 1995, 2001-2002, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2004, 2006-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
@@ -176,6 +176,29 @@
#endif
+#if @GNULIB_SETENV@
+# if address@hidden@
+/* Set NAME to VALUE in the environment.
+ If REPLACE is nonzero, overwrite an existing value. */
+extern int setenv (const char *name, const char *value, int replace);
+# endif
+#endif
+
+
+#if @GNULIB_UNSETENV@
+# if @HAVE_UNSETENV@
+# if @VOID_UNSETENV@
+/* On some systems, unsetenv() returns void.
+ This is the case for MacOS X 10.3, FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4. */
+# define unsetenv(name) ((unsetenv)(name), 0)
+# endif
+# else
+/* Remove the variable NAME from the environment. */
+extern int unsetenv (const char *name);
+# endif
+#endif
+
+
#ifdef __cplusplus
}
#endif
Index: gnulib/lib/unistd.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/unistd.in.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/unistd.in.h 26 Dec 2007 00:53:46 -0000 1.1
+++ gnulib/lib/unistd.in.h 28 Dec 2007 14:59:13 -0000 1.2
@@ -181,7 +181,10 @@
#if @GNULIB_GETPAGESIZE@
-# if address@hidden@
+# if @REPLACE_GETPAGESIZE@
+# define getpagesize rpl_getpagesize
+extern int getpagesize (void);
+# elif address@hidden@
/* This is for POSIX systems. */
# if !defined getpagesize && defined _SC_PAGESIZE
# if ! (defined __VMS && __VMS_VER < 70000000)
Index: gnulib/lib/unsetenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/unsetenv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/unsetenv.c 26 Nov 2007 19:12:41 -0000 1.3
+++ gnulib/lib/unsetenv.c 28 Dec 2007 14:59:13 -0000 1.4
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002,2005-2006 Free Software Foundation,
Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002,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
@@ -16,12 +16,14 @@
#include <config.h>
+/* Specification. */
+#include <stdlib.h>
+
#include <errno.h>
#if !_LIBC
# define __set_errno(ev) ((errno) = (ev))
#endif
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Index: gnulib/lib/xsetenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xsetenv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/lib/xsetenv.c 26 Nov 2007 19:12:42 -0000 1.5
+++ gnulib/lib/xsetenv.c 28 Dec 2007 14:59:13 -0000 1.6
@@ -21,7 +21,6 @@
#include <stdlib.h>
-#include "setenv.h"
#include "error.h"
#include "gettext.h"
Index: gnulib/lib/xsetenv.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xsetenv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/xsetenv.h 26 Nov 2007 19:12:42 -0000 1.3
+++ gnulib/lib/xsetenv.h 28 Dec 2007 14:59:13 -0000 1.4
@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Get unsetenv(). It can be used without error checking. */
-#include "setenv.h"
+#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
Index: gnulib/m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnulib/m4/gnulib-comp.m4 15 Dec 2007 14:40:08 -0000 1.19
+++ gnulib/m4/gnulib-comp.m4 28 Dec 2007 14:59:13 -0000 1.20
@@ -56,6 +56,8 @@
gl_FUNC_GETTIMEOFDAY
gl_INLINE
gl_LOCALCHARSET
+
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+ AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
gl_FUNC_MALLOC_POSIX
gl_STDLIB_MODULE_INDICATOR([malloc-posix])
gl_MALLOCA
@@ -72,7 +74,7 @@
gl_FUNC_MKSTEMP
gl_STDLIB_MODULE_INDICATOR([mkstemp])
gl_FUNC_SETENV
- gl_FUNC_UNSETENV
+ gl_STDLIB_MODULE_INDICATOR([setenv])
AM_STDBOOL_H
gl_STDINT_H
gl_STDLIB_H
@@ -87,6 +89,8 @@
AC_PROG_MKDIR_P
gl_FUNC_GEN_TEMPNAME
gl_UNISTD_H
+ gl_FUNC_UNSETENV
+ gl_STDLIB_MODULE_INDICATOR([unsetenv])
gl_WCHAR_H
gl_WCTYPE_H
gl_FUNC_WCWIDTH
@@ -246,7 +250,6 @@
lib/ref-add.sin
lib/ref-del.sin
lib/setenv.c
- lib/setenv.h
lib/stdbool.in.h
lib/stdint.in.h
lib/stdlib.in.h
Index: gnulib/m4/setenv.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/setenv.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/setenv.m4 25 Jun 2007 21:16:33 -0000 1.2
+++ gnulib/m4/setenv.m4 28 Dec 2007 14:59:13 -0000 1.3
@@ -1,4 +1,4 @@
-# setenv.m4 serial 8
+# setenv.m4 serial 9
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,
@@ -6,8 +6,10 @@
AC_DEFUN([gl_FUNC_SETENV],
[
+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([setenv])
if test $ac_cv_func_setenv = no; then
+ HAVE_SETENV=0
AC_LIBOBJ([setenv])
gl_PREREQ_SETENV
fi
@@ -16,14 +18,20 @@
# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
[
+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([setenv])
+ if test $ac_cv_func_setenv = no; then
+ HAVE_SETENV=0
+ fi
gl_PREREQ_SETENV
])
AC_DEFUN([gl_FUNC_UNSETENV],
[
+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_CHECK_FUNCS([unsetenv])
if test $ac_cv_func_unsetenv = no; then
+ HAVE_UNSETENV=0
AC_LIBOBJ([unsetenv])
gl_PREREQ_UNSETENV
else
@@ -40,7 +48,7 @@
#endif
], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
if test $gt_cv_func_unsetenv_ret = 'void'; then
- AC_DEFINE(VOID_UNSETENV, 1, [Define if unsetenv() returns void, not
int.])
+ VOID_UNSETENV=1
fi
fi
])
Index: gnulib/m4/stdlib_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdlib_h.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/m4/stdlib_h.m4 26 Nov 2007 19:12:43 -0000 1.4
+++ gnulib/m4/stdlib_h.m4 28 Dec 2007 14:59:13 -0000 1.5
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 4
+# stdlib_h.m4 serial 5
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,
@@ -26,12 +26,17 @@
GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP])
GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP])
GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV])
+ GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV])
+ GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX])
HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT])
HAVE_MALLOC_POSIX=1; AC_SUBST([HAVE_MALLOC_POSIX])
HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP])
HAVE_REALLOC_POSIX=1; AC_SUBST([HAVE_REALLOC_POSIX])
+ HAVE_SETENV=1; AC_SUBST([HAVE_SETENV])
+ HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV])
REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP])
REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV])
+ VOID_UNSETENV=0; AC_SUBST([VOID_UNSETENV])
])
Index: gnulib/m4/unistd_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/unistd_h.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/m4/unistd_h.m4 15 Dec 2007 14:40:08 -0000 1.5
+++ gnulib/m4/unistd_h.m4 28 Dec 2007 14:59:13 -0000 1.6
@@ -55,6 +55,7 @@
REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN])
REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR])
REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD])
+ REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE])
REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN])
REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK])
])
P gnulib/lib/Makefile.am
P gnulib/lib/setenv.c
cvs update: `gnulib/lib/setenv.h' is no longer in the repository
P gnulib/lib/stdlib.in.h
P gnulib/lib/unistd.in.h
P gnulib/lib/unsetenv.c
P gnulib/lib/xsetenv.c
P gnulib/lib/xsetenv.h
P gnulib/m4/gnulib-comp.m4
P gnulib/m4/setenv.m4
P gnulib/m4/stdlib_h.m4
P gnulib/m4/unistd_h.m4
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Fri Dec 28 10:23:01 EST 2007),
Karl Berry <=