summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog14
-rw-r--r--lib/Makefile.am37
2 files changed, 51 insertions, 0 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 71fc71572..ac3c19dfe 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,17 @@
+2006-08-10 Paul Eggert <eggert@cs.ucla.edu>
+
+ Accommodate new getaddrinfo implementation in gnulib.
+ * inet_ntop.c, inet_ntop.h, snprintf.c, snprintf.h, socket_.h:
+ New files, from gnulib.
+ * .cppi-disable: Add snprintf.h, socket_.h.
+ * Makefile.am (libcoreutils_a_SOURCES): Add inet_ntop.h, snprintf.h.
+ (MOSTLYCLEANDIRS): New macro.
+ (BUILT_SOURCES): Add $(ARPA_INET_H), $(SYS_SOCKET_H), $(NETINET_IN_H).
+ (arpa/inet.h, netinet/in.h, sys/socket.h): New rules.
+ (MOSTLYCLEANFILES): Add arpa/inet.h, arpa/inet.h-t, netinet/in.h,
+ netinet/in.h-t, sys/socket.h, sys/socket.h-t.
+ (EXTRA_DIST): Add socket_.h.
+
2006-08-09 Paul Eggert <eggert@cs.ucla.edu>
* allocsa.h, config.charset, error.c, error.h, exitfail.c, full-write.c:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 248b0dc87..54c795ced 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,12 +37,14 @@ libcoreutils_a_SOURCES = \
full-write.c full-write.h \
getaddrinfo.h \
gettext.h \
+ inet_ntop.h \
localcharset.c localcharset.h \
mbchar.h \
mbswidth.c mbswidth.h \
mbuiter.h \
readtokens0.c readtokens0.h \
setenv.h \
+ snprintf.h \
strcase.h \
strnlen1.c strnlen1.h \
strstr.h \
@@ -71,6 +73,7 @@ lib_OBJECTS = $(libcoreutils_a_OBJECTS)
BUILT_SOURCES = getdate.c
CLEANFILES =
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANDIRS =
MOSTLYCLEANFILES =
SUFFIXES =
@@ -189,6 +192,40 @@ MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
BUILT_SOURCES += $(GETOPT_H)
EXTRA_DIST += getopt_.h getopt_int.h
+BUILT_SOURCES += $(ARPA_INET_H)
+
+# We need the following in order to create <arpa/inet.h> when the system
+# doesn't have one.
+arpa/inet.h:
+ test -d arpa || mkdir arpa
+ echo '#include <sys/socket.h>' >$@-t
+ mv $@-t $@
+MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
+MOSTLYCLEANDIRS += arpa
+
+BUILT_SOURCES += $(SYS_SOCKET_H)
+EXTRA_DIST += socket_.h
+
+BUILT_SOURCES += $(NETINET_IN_H)
+
+# We need the following in order to create <netinet/in.h> when the system
+# doesn't have one.
+netinet/in.h:
+ test -d netinet || mkdir netinet
+ echo '#include <sys/socket.h>' >$@-t
+ mv $@-t $@
+MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
+MOSTLYCLEANDIRS += netinet
+
+# We need the following in order to create <sys/socket.h> when the system
+# doesn't have one that works with the given compiler.
+sys/socket.h: socket_.h
+ test -d sys || mkdir sys
+ cp $(srcdir)/socket_.h $@-t
+ mv $@-t $@
+MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
+MOSTLYCLEANDIRS += sys
+
check: unit-test
.PHONY: unit-test