[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
coreutils-proper patches to adjust to recent gnulib changes
From: |
Paul Eggert |
Subject: |
coreutils-proper patches to adjust to recent gnulib changes |
Date: |
Thu, 22 Sep 2005 00:03:38 -0700 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
I installed this to bring coreutils up to speed with the recent
gnulib changes.
2005-09-21 Paul Eggert <address@hidden>
* lib/Makefile.am (libcoreutils_a_SOURCES): Add getaddrinfo.h,
mbchar.c, mbchar.h, mbuiter.h, strcase.h, strlen1.c, strnlen1.h,
strstr.h.
* m4/check-decl.m4 (_gl_DECL_HEADERS): Don't bother checking for
standard C headers, or for headers we no longer use.
* m4/jm-macros.m4 (gl_MACROS): Don't require gl_FUNC_XANSTRFTIME;
no longer needed.
(gl_CHECK_ALL_HEADERS): Don't check for memory.h, mntent.h, mnttab.h,
netdb.h, stdlib.h, stdint.h, string.h, sys/filsys.h, sys/fs/s5param.h,
sys/fs_types.h, sys/fstyp.h, sys/mntent.h, sys/socket.h, sys/stafs.h,
sys/timeb.h, unistd.h. No longer needed.
* m4/prereq.m4 (gl_PREREQ): Require gl_FUNC_GETLINE rather than
AM_FUNC_GETLINE. Require gl_FUNC_GETPASS_GNU rather than
gl_FUNC_GETPASS. Require gl_MBCHAR and gl_MBITER.
* src/dircolors.c: Include strcase.h.
* src/pinky.c: Include canon-host.h rather than declaring
canon_host ourselves.
* src/who.c: Likewise.
Index: lib/Makefile.am
===================================================================
RCS file: /fetish/cu/lib/Makefile.am,v
retrieving revision 1.232
diff -p -u -r1.232 Makefile.am
--- lib/Makefile.am 16 Sep 2005 07:32:13 -0000 1.232
+++ lib/Makefile.am 22 Sep 2005 06:57:51 -0000
@@ -32,10 +32,16 @@ libcoreutils_a_SOURCES = \
fprintftime.c fprintftime.h \
full-read.c full-read.h \
full-write.c full-write.h \
+ getaddrinfo.h \
gettext.h \
localcharset.c localcharset.h \
+ mbchar.c mbchar.h \
mbswidth.c mbswidth.h \
+ mbuiter.h \
readtokens0.c readtokens0.h \
+ strcase.h \
+ strnlen1.c strnlen1.h \
+ strstr.h \
time_r.c time_r.h \
unicodeio.c unicodeio.h \
verify.h \
Index: m4/check-decl.m4
===================================================================
RCS file: /fetish/cu/m4/check-decl.m4,v
retrieving revision 1.33
diff -p -u -r1.33 check-decl.m4
--- m4/check-decl.m4 2 Jul 2005 08:54:13 -0000 1.33
+++ m4/check-decl.m4 22 Sep 2005 06:57:51 -0000
@@ -1,4 +1,4 @@
-#serial 21
+#serial 22
dnl This is just a wrapper function to encapsulate this kludge.
dnl Putting it in a separate file like this helps share it between
@@ -67,7 +67,5 @@ dnl FIXME: when autoconf has support for
dnl This is a little helper so we can require these header checks.
AC_DEFUN([_gl_DECL_HEADERS],
[
- AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
- unistd.h sys/time.h utmp.h utmpx.h)
+ AC_CHECK_HEADERS_ONCE(grp.h pwd.h sys/time.h utmp.h)
])
Index: m4/jm-macros.m4
===================================================================
RCS file: /fetish/cu/m4/jm-macros.m4,v
retrieving revision 1.228
diff -p -u -r1.228 jm-macros.m4
--- m4/jm-macros.m4 16 Sep 2005 07:40:02 -0000 1.228
+++ m4/jm-macros.m4 22 Sep 2005 06:57:51 -0000
@@ -1,4 +1,4 @@
-#serial 92 -*- autoconf -*-
+#serial 93 -*- autoconf -*-
dnl Misc type-related macros for coreutils.
@@ -177,45 +177,25 @@ AC_DEFUN([gl_MACROS],
AC_REQUIRE([gl_ROOT_DEV_INO])
AC_REQUIRE([gl_VERSION_ETC])
AC_REQUIRE([gl_DIACRIT])
- AC_REQUIRE([gl_FUNC_XANSTRFTIME])
])
-# These tests must be run before any use of AC_CHECK_TYPE,
-# because that macro compiles code that tests e.g., HAVE_UNISTD_H.
-# See the definition of ac_includes_default in `configure'.
AC_DEFUN([gl_CHECK_ALL_HEADERS],
[
AC_CHECK_HEADERS_ONCE( \
hurd.h \
- memory.h \
- mntent.h \
- mnttab.h \
- netdb.h \
paths.h \
priv.h \
- stdlib.h \
- stdint.h \
- string.h \
stropts.h \
- sys/filsys.h \
- sys/fs/s5param.h \
- sys/fs_types.h \
- sys/fstyp.h \
sys/ioctl.h \
- sys/mntent.h \
sys/param.h \
sys/resource.h \
- sys/socket.h \
- sys/statfs.h \
sys/statvfs.h \
sys/systeminfo.h \
sys/time.h \
- sys/timeb.h \
sys/vfs.h \
sys/wait.h \
syslog.h \
termios.h \
- unistd.h \
utime.h \
)
AC_CHECK_HEADERS(sys/mount.h sys/sysctl.h, [], [],
Index: m4/prereq.m4
===================================================================
RCS file: /fetish/cu/m4/prereq.m4,v
retrieving revision 1.119
diff -p -u -r1.119 prereq.m4
--- m4/prereq.m4 16 Sep 2005 07:40:19 -0000 1.119
+++ m4/prereq.m4 22 Sep 2005 06:57:51 -0000
@@ -1,4 +1,4 @@
-#serial 61
+#serial 62
dnl We use gl_ for non Autoconf macros.
m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -31,10 +31,7 @@ AC_DEFUN([gl_PREREQ],
# We don't yet use c-stack.c.
# AC_REQUIRE([gl_C_STACK])
- AC_REQUIRE([AM_FUNC_GETLINE])
AC_REQUIRE([AM_STDBOOL_H])
- AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
- AC_REQUIRE([gl_FUNC_MKSTEMP])
AC_REQUIRE([gl_ALLOCSA])
AC_REQUIRE([gl_BACKUPFILE])
AC_REQUIRE([gl_BASENAME])
@@ -58,8 +55,9 @@ AC_DEFUN([gl_PREREQ],
AC_REQUIRE([gl_FUNC_DUP2])
AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
AC_REQUIRE([gl_FUNC_GETHOSTNAME])
+ AC_REQUIRE([gl_FUNC_GETLINE])
AC_REQUIRE([AC_FUNC_GETLOADAVG])
- AC_REQUIRE([gl_FUNC_GETPASS])
+ AC_REQUIRE([gl_FUNC_GETPASS_GNU])
AC_REQUIRE([gl_FUNC_GETUSERSHELL])
AC_REQUIRE([gl_FUNC_LSTAT])
AC_REQUIRE([gl_FUNC_MEMCHR])
@@ -68,7 +66,9 @@ AC_DEFUN([gl_PREREQ],
AC_REQUIRE([gl_FUNC_MEMPCPY])
AC_REQUIRE([gl_FUNC_MEMRCHR])
AC_REQUIRE([gl_FUNC_MEMSET])
+ AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
AC_REQUIRE([gl_FUNC_MKTIME])
+ AC_REQUIRE([gl_FUNC_MKSTEMP])
AC_REQUIRE([gl_FUNC_NONREENTRANT_EUIDACCESS])
AC_REQUIRE([gl_FUNC_READLINK])
AC_REQUIRE([gl_FUNC_RMDIR])
@@ -109,6 +109,8 @@ AC_DEFUN([gl_PREREQ],
AC_REQUIRE([gl_LINEBUFFER])
AC_REQUIRE([gl_LOCALCHARSET])
AC_REQUIRE([gl_LONG_OPTIONS])
+ AC_REQUIRE([gl_MBCHAR])
+ AC_REQUIRE([gl_MBITER])
AC_REQUIRE([gl_MBSWIDTH])
AC_REQUIRE([gl_MD5])
AC_REQUIRE([gl_MEMCOLL])
Index: src/dircolors.c
===================================================================
RCS file: /fetish/cu/src/dircolors.c,v
retrieving revision 1.91
diff -p -u -r1.91 dircolors.c
--- src/dircolors.c 5 Sep 2005 17:11:15 -0000 1.91
+++ src/dircolors.c 22 Sep 2005 06:57:51 -0000
@@ -31,6 +31,7 @@
#include "getline.h"
#include "obstack.h"
#include "quote.h"
+#include "strcase.h"
#include "xstrndup.h"
/* The official name of this program (e.g., no `g' prefix). */
Index: src/pinky.c
===================================================================
RCS file: /fetish/cu/src/pinky.c,v
retrieving revision 1.49
diff -p -u -r1.49 pinky.c
--- src/pinky.c 2 Jun 2005 05:17:24 -0000 1.49
+++ src/pinky.c 22 Sep 2005 06:57:51 -0000
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include "system.h"
+#include "canon-host.h"
#include "error.h"
#include "hard-locale.h"
#include "inttostr.h"
@@ -286,7 +287,6 @@ print_entry (const STRUCT_UTMP *utmp_ent
#ifdef HAVE_UT_HOST
if (include_where && utmp_ent->ut_host[0])
{
- extern char *canon_host ();
char ut_host[sizeof (utmp_ent->ut_host) + 1];
char *host = NULL;
char *display = NULL;
Index: src/who.c
===================================================================
RCS file: /fetish/cu/src/who.c,v
retrieving revision 1.110
diff -p -u -r1.110 who.c
--- src/who.c 2 Jun 2005 05:17:24 -0000 1.110
+++ src/who.c 22 Sep 2005 06:57:51 -0000
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include "system.h"
+#include "canon-host.h"
#include "readutmp.h"
#include "error.h"
#include "hard-locale.h"
@@ -99,7 +100,6 @@
#endif
char *ttyname ();
-char *canon_host ();
/* The name this program was run with. */
char *program_name;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- coreutils-proper patches to adjust to recent gnulib changes,
Paul Eggert <=