Merge of r1850745,r1855446 from trunk:

modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
a non-fatal warning/error under maintainer-mode.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1856931 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 810f0d7e7456f552eaea22562b92e74872881099..4723fc403f06288b2299fcbcc34bbbc8b80d6b47 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -114,6 +114,10 @@ AC_DEFUN([FIND_LIBXML2], [
     if test -n "${xml2_path}" ; then
       ac_cv_libxml2=yes
       XML2_INCLUDES="${xml2_path}"
+      dnl libxml2 includes unicode/*.h files which uses C++ comments
+      if test "$GCC" = "yes"; then
+        APR_ADDTO(MOD_CPPFLAGS, ["-Wno-error=comment"])
+      fi
     else
       ac_cv_libxml2=no
     fi