From 894ac6d2f85e1de3964a22aa49fa375770e7e5cf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 5 Jul 2017 23:22:07 +0300
Subject: Fix icu-59 and libxml2 issue.

---
 configure.ac | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1da07677c..3de8a975b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -402,15 +402,20 @@ if test "$xmllib" == "libxml"; then
     AC_CHECK_HEADERS(
         [libxml/xmlreader.h],
         ,
-        CPPFLAGS="$CPPFLAGS `$ICU_CONFIG --cxxflags`"
+        # workaround for icu-59 issue.
+        CPPFLAGS="$CPPFLAGS --std=c++0x"
         AC_MSG_RESULT([no])
         AC_MSG_CHECKING([Checking libxml2 headers with icu bug fix])
+        icu_bug=yes
+        $as_unset ac_cv_header_libxml_xmlreader_h
+    )
+    if test "$icu_bug" == "yes"; then
         AC_CHECK_HEADERS(
             [libxml/xmlreader.h],
             ,
             AC_MSG_ERROR([ *** libxml2 library found but cannot find headers (http://xmlsoft.org/)])
         )
-    )
+    fi
 fi
 
 if test "$xmllib" == "pugixml"; then
-- 
cgit v1.2.3-70-g09d2