From 326217c1f8bfd86730dea722b5f132833b39cb13 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 7 Feb 2017 21:05:48 +0300
Subject: Fix compilation with pugixml.

---
 src/utils/dumplibs.cpp        | 5 +++++
 src/utils/xml/pugixmlwriter.h | 2 +-
 src/utils/xml_unittest.cc     | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp
index 4efd647d8..8fb7036bf 100644
--- a/src/utils/dumplibs.cpp
+++ b/src/utils/dumplibs.cpp
@@ -39,7 +39,9 @@ PRAGMA45(GCC diagnostic pop)
 
 #include <curl/curl.h>
 
+#ifdef ENABLE_LIBXML
 #include <libxml/xmlversion.h>
+#endif  // ENABLE_LIBXML
 
 #include "debug.h"
 
@@ -109,7 +111,10 @@ void dumpLibs()
 {
     logger->log("Compiled with:");
     logger->log(" zLib: %s", ZLIB_VERSION);
+#ifdef ENABLE_LIBXML
     logger->log(" libxml2: %s", LIBXML_DOTTED_VERSION);
+#endif  // ENABLE_LIBXML
+
     logger->log(" libcurl: %s", LIBCURL_VERSION);
     logger->log(" libpng: %s", PNG_LIBPNG_VER_STRING);
     PHYSFS_Version physfsVersion;
diff --git a/src/utils/xml/pugixmlwriter.h b/src/utils/xml/pugixmlwriter.h
index a5952de8b..3d6712992 100644
--- a/src/utils/xml/pugixmlwriter.h
+++ b/src/utils/xml/pugixmlwriter.h
@@ -26,7 +26,7 @@
 #include "enums/simpletypes/skiperror.h"
 #include "enums/simpletypes/useresman.h"
 
-#include "utils/xml/pugixml.inc"
+#include "utils/xml/pugixml.h"
 
 #include <pugixml.hpp>
 
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 40876e0d2..b7461b617 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -30,6 +30,9 @@
 #include "utils/delete2.h"
 #include "utils/env.h"
 #include "utils/physfstools.h"
+#ifdef ENABLE_PUGIXML
+#include "utils/xmlwriter.h"
+#endif  // ENABLE_PUGIXML
 
 #include "render/sdlgraphics.h"
 
-- 
cgit v1.2.3-70-g09d2