From 965eaba4d9fe30eb4f53627e165110e2c79dc8dd Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 29 Nov 2006 23:39:15 +0000
Subject: * 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.

---
 ChangeLog       | 10 ++++++++++
 lib/rtapelib.c  |  2 +-
 m4/system.m4    |  8 ++++----
 rmt/Makefile.am |  4 ++--
 rmt/rmt.c       |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a718a0..1eeb959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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.
+
 2006-09-27  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* tests/genfile.c (exec_command): Add extra spaces.
diff --git a/lib/rtapelib.c b/lib/rtapelib.c
index 3466a7c..af19b04 100644
--- a/lib/rtapelib.c
+++ b/lib/rtapelib.c
@@ -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
diff --git a/m4/system.m4 b/m4/system.m4
index a85abdb..0e00364 100644
--- a/m4/system.m4
+++ b/m4/system.m4
@@ -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])
diff --git a/rmt/Makefile.am b/rmt/Makefile.am
index c6ba2e3..b455212 100644
--- a/rmt/Makefile.am
+++ b/rmt/Makefile.am
@@ -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
diff --git a/rmt/rmt.c b/rmt/rmt.c
index f144474..ed9a09b 100644
--- a/rmt/rmt.c
+++ b/rmt/rmt.c
@@ -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>
-- 
cgit v1.2.1