More NetBSD porting.

* Makefile (EXTRA_FLAGS): Handy new variable for additional
ad-hoc CFLAGS. Needed by a new test in configure.

* configure: Check for annoying warnings about char being used
as an array subscript when calling the macros from <ctype.h>.
If this occurs, suppress it by #undef-ing the macros.
(lang_flags): Switching fromm _XOPEN_SOURCE to _XOPEN_SOURCE=2
because this is needed on NetBSD to obtain declarations of
popen and pclose.

* stream.c (pipe_close): If we don't have the WIFCONTINUED macro,
then define it to expand to zero. It's absent on NetBSD and they
already seem to have a hack for this because there is a warning about
the function not being defined, but then the program links anyway.
Let's do it properly and not rely on their hack.

4 files changed, 51 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 838e5dbc..2659a307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2012-04-10  Kaz Kylheku  <kaz@kylheku.com>
 
+	More NetBSD porting.
+
+	* Makefile (EXTRA_FLAGS): Handy new variable for additional
+	ad-hoc CFLAGS. Needed by a new test in configure.
+
+	* configure: Check for annoying warnings about char being used
+	as an array subscript when calling the macros from <ctype.h>.
+	If this occurs, suppress it by #undef-ing the macros.
+	(lang_flags): Switching fromm _XOPEN_SOURCE to _XOPEN_SOURCE=2
+	because this is needed on NetBSD to obtain declarations of
+	popen and pclose.
+
+	* stream.c (pipe_close): If we don't have the WIFCONTINUED macro,
+	then define it to expand to zero. It's absent on NetBSD and they
+	already seem to have a hack for this because there is a warning about
+	the function not being defined, but then the program links anyway.
+	Let's do it properly and not rely on their hack.
+
+2012-04-10  Kaz Kylheku  <kaz@kylheku.com>
+
 	* arith.c (INT_PTR_MAX_MP): New static variable.
 	(in_int_ptr_range): New function.
 	(arith_init): Initialize INT_PTR_MAX_MP.
diff --git a/Makefile b/Makefile
index 2296e095..dac19cae 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@
 include config.make
 
 CFLAGS := -I. -I$(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \
-          $(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS)
+          $(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS) $(EXTRA_FLAGS)
 CFLAGS += -I$(top_srcdir)/mpi-$(mpi_version)
 CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS))
 
diff --git a/configure b/configure
index 6ef68942..c6552968 100755
--- a/configure
+++ b/configure
@@ -128,7 +128,7 @@ yacc_given=${yacc+y}
 yacc=${yacc-'$(cross)$(tool_prefix)$(yaccname)'}
 nm=${nm-'$(cross)$(tool_prefix)nm'}
 opt_flags=${opt_flags--O2}
-lang_flags=${lang_flags--ansi -D_XOPEN_SOURCE}
+lang_flags=${lang_flags--ansi -D_XOPEN_SOURCE=2}
 diag_flags=${diag_flags--Wall -Wmissing-prototypes -Wstrict-prototypes}
 debug_flags=${debug_flags--g}
 inline=${inline-}
@@ -666,6 +666,32 @@ done
 printf "done\n"
 
 #
+# Check for annoying warnings from ctype.h macros
+#
+
+printf "Checking for annoying warnings from <ctype.h> macros ... "
+
+cat > conftest.c <<!
+#include <ctype.h>
+
+int main(void)
+{
+  char x = '3';
+  return isdigit(x);
+}
+!
+if ! $make EXTRA_FLAGS=-Werror conftest > conftest.err 2>&1 || ! [ -x conftest ] ; then
+  printf "present\n"
+  cat >> config.h <<!
+$(for x in isalpha isupper islower isdigit isxdigit isalnum isspace \
+           ispunct isprint isgraph iscntrl isblank ; do \
+    printf "#undef %s\n" $x ; done)
+!
+else
+  printf "absent\n"
+fi
+
+#
 # Check what kind of C type we have for integers wider than long,
 # if any.
 #
diff --git a/stream.c b/stream.c
index e877d200..0201c3eb 100644
--- a/stream.c
+++ b/stream.c
@@ -284,6 +284,9 @@ static val pipe_close(val stream, val throw_on_error)
                   lit("unable to obtain status of command ~a: ~a/~s"),
                   stream, num(errno), string_utf8(strerror(errno)), nao);
 #ifdef HAVE_SYS_WAIT
+#ifndef WIFCONTINUED
+#define WIFCONTINUED(X) 0
+#endif
       } else if (WIFEXITED(status)) {
         int exitstatus = WEXITSTATUS(status);
         uw_throwf(process_error_s, lit("pipe ~a terminated with status ~a"),