[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-tar] paxutils changes to accommodate current gnulib and tar bootstr
From: |
Paul Eggert |
Subject: |
[Bug-tar] paxutils changes to accommodate current gnulib and tar bootstrap |
Date: |
Wed, 29 Nov 2006 15:39:50 -0800 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
I'm porting tar to the latest gnulib and build tools. Here's
the first step:
2006-11-29 Paul Eggert <address@hidden>
* lib/rtapelib.c: Include <rmt-command.h> rather than <localedir.h>,
to accommodate recent changes to gnulib and tar.
* rmt/rmt.c: Likewise.
* rmt/Makefile.am (rmt.o): Depend on configmake.h, not localedir.h.
* m4/system.m4 (PU_SUSTEM): Put AC_REQUIRE wrappers around
AC_HEADER_STDC, etc. This avoids a warning from automake,
with the latest gnulib.
Index: lib/rtapelib.c
===================================================================
RCS file: /cvsroot/paxutils/paxutils/lib/rtapelib.c,v
retrieving revision 1.4
diff -p -u -r1.4 rtapelib.c
--- lib/rtapelib.c 20 Feb 2006 08:13:29 -0000 1.4
+++ lib/rtapelib.c 29 Nov 2006 23:35:18 -0000
@@ -60,7 +60,7 @@
#endif
#include <rmt.h>
-#include <localedir.h>
+#include <rmt-command.h>
/* Exit status if exec errors. */
#define EXIT_ON_EXEC_ERROR 128
Index: m4/system.m4
===================================================================
RCS file: /cvsroot/paxutils/paxutils/m4/system.m4,v
retrieving revision 1.6
diff -p -u -r1.6 system.m4
--- m4/system.m4 7 Aug 2006 22:55:31 -0000 1.6
+++ m4/system.m4 29 Nov 2006 23:35:18 -0000
@@ -6,7 +6,7 @@
# with or without modifications, as long as this notice is preserved.
AC_DEFUN([PU_SYSTEM],[
- AC_HEADER_STDC
+ AC_REQUIRE([AC_HEADER_STDC])
AC_CHECK_HEADERS_ONCE([string.h memory.h fcntl.h sys/wait.h \
sys/gentape.h sys/tape.h sys/device.h sys/param.h sys/tprintf.h sys/mtio.h \
@@ -17,11 +17,11 @@ AC_DEFUN([PU_SYSTEM],[
#include <sys/param.h>
#endif])
- AC_HEADER_TIME
+ AC_REQUIRE([AC_HEADER_TIME])
AC_CHECK_MEMBERS([struct stat.st_blksize]) dnl instead of
AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
- AC_STRUCT_ST_BLKSIZE
+ AC_REQUIRE([AC_STRUCT_ST_BLOCKS])
+ AC_REQUIRE([AC_STRUCT_ST_BLKSIZE])
AC_CHECK_FUNCS_ONCE(lstat mkfifo setlocale)
AC_REQUIRE([gl_INTTYPES_H])
Index: rmt/Makefile.am
===================================================================
RCS file: /cvsroot/paxutils/paxutils/rmt/Makefile.am,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 Makefile.am
--- rmt/Makefile.am 6 Sep 2004 13:49:41 -0000 1.1.1.1
+++ rmt/Makefile.am 29 Nov 2006 23:35:18 -0000
@@ -4,10 +4,10 @@ EXTRA_PROGRAMS = rmt
rmt_SOURCES = rmt.c
-INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib
+INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib
LDADD = ../lib/lib$(PACKAGE).a $(LIBINTL)
rmt_LDADD = $(LDADD) $(LIB_SETSOCKOPT)
-rmt.o: ../lib/localedir.h
+rmt.o: ../lib/configmake.h
Index: rmt/rmt.c
===================================================================
RCS file: /cvsroot/paxutils/paxutils/rmt/rmt.c,v
retrieving revision 1.15
diff -p -u -r1.15 rmt.c
--- rmt/rmt.c 27 Sep 2006 09:17:36 -0000 1.15
+++ rmt/rmt.c 29 Nov 2006 23:35:18 -0000
@@ -34,7 +34,7 @@
#include "system.h"
#include "system-ioctl.h"
#include <closeout.h>
-#include <localedir.h>
+#include <configmake.h>
#include <safe-read.h>
#include <full-write.h>
#include <version-etc.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Bug-tar] paxutils changes to accommodate current gnulib and tar bootstrap,
Paul Eggert <=