Merge SVN 3732, 3733

ChangeLog

@@ -321,6 +321,11 @@
 	  as its documentation specify to explicit include via -I dstdir/json-c
 	* NEWS, DEPENDENCIES: updated
 
+2020-07-24  James K. Lowden  <[email protected]>
+
+	* build_aux/bootstrap: suppress portability warning stemming from
+	AMINCLUDE_STATIC
+
 2020-07-19  Edward Hart <[email protected]>
 
 	* configure.ac: added support for JSON-C as JSON handler

build_aux/bootstrap

@@ -93,6 +93,16 @@ autoreconf $AC_OPTS $MAINPATH > $msgs 2>&1; ret=$?
 #  test $retval -eq 0 # || exit $retval
 #done
 
+# Filter aminclude_static as those are only used _within_ another
+#        check so reporting as portability problem is only noise.
+# This has the effect of redirecting some error messages to stdout. 
+
+awk '/^aminclude_static[.]am:/ { msg = msg sep $0; sep = "\n"; next } 
+     /Makefile[.]am.+aminclude_static.am.+from here/ { 
+     					       msg = ""; sep = ""; next }
+     msg { print msg > "/dev/stderr"; msg = "" }
+     { print }' $msgs
+
 if test $ret -ne 0; then
   echo; echo "ERROR, autoreconf returned $ret - aborting bootstrap" && exit $ret
 fi