Merge branch 'gawk-4.1-stable'

8 files changed, 34 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cc5816c..d179c6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c (closemabyesocket): Define if not defined, e.g. building
+	without socket code. Thanks to dave.gma@googlemail.com (Dave Sines)
+	for the report.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/extension/ChangeLog b/extension/ChangeLog
index afd64ff7..f3a1c7a8 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (install-data-hook): Use $(DESTDIR) when removing
+	the .la files. Thanks to Lars Wendler <polynomial-c@gentoo.org>
+	for the report and fix.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 9c49bb81..11826e2b 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -100,7 +100,7 @@ testext_la_LIBADD     = $(MY_LIBS)
 
 install-data-hook:
 	for i in $(pkgextension_LTLIBRARIES) ; do \
-		$(RM) $(pkgextensiondir)/$$i ; \
+		$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
 	done
 
 # Keep the uninstall check working:
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 040cdb8f..d81b1696 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1231,7 +1231,7 @@ uninstall-man: uninstall-man3
 
 install-data-hook:
 	for i in $(pkgextension_LTLIBRARIES) ; do \
-		$(RM) $(pkgextensiondir)/$$i ; \
+		$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
 	done
 
 # Keep the uninstall check working:
diff --git a/io.c b/io.c
index b0b60deb..2a5c2e73 100644
--- a/io.c
+++ b/io.c
@@ -166,6 +166,12 @@
 # define SOCKET			int
 #endif
 
+#else /* HAVE_SOCKETS */
+
+#ifndef closemaybesocket
+# define closemaybesocket(fd)	close(fd)
+#endif
+
 #endif /* HAVE_SOCKETS */
 
 #ifndef HAVE_SETSID
diff --git a/test/ChangeLog b/test/ChangeLog
index 4d4db2fd..6d4cd1c2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (charset-msg-start): Add a warning message that tests
+	may fail without adequate locale support, per request from
+	Nelson H.F. Beebe.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/test/Makefile.am b/test/Makefile.am
index b0827077..238f2ed7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1145,6 +1145,10 @@ machine-msg-end:
 
 charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
+	@echo "************************************************"
+	@echo "** Some or all of these tests may fail if you **"
+	@echo "** have inadequate or missing locale support  **"
+	@echo "************************************************"
 
 charset-msg-end:
 	@echo "======== Done with tests that can vary based on character set or locale support ========"
diff --git a/test/Makefile.in b/test/Makefile.in
index acc274b0..0831c597 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1572,6 +1572,10 @@ machine-msg-end:
 
 charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
+	@echo "************************************************"
+	@echo "** Some or all of these tests may fail if you **"
+	@echo "** have inadequate or missing locale support  **"
+	@echo "************************************************"
 
 charset-msg-end:
 	@echo "======== Done with tests that can vary based on character set or locale support ========"