From: Stefan Eissing <icing@apache.org>
Date: Thu, 4 Apr 2019 13:31:09 +0000 (+0000)
Subject: Merge of r1850745,r1855446 from trunk:
X-Git-Tag: 2.4.40~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c740ff0dc59476c012b49ab642227ac056ccc0f;p=thirdparty%2Fapache%2Fhttpd.git

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 810f0d7e745..4723fc403f0 100644
--- 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