From 4544c68a6ed18a42edb10903b9e0d4983a0e2f5c Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 5 May 2016 15:10:01 -0400
Subject: [PATCH] expat: Hard-code configuration options for our needs

Also include our configured header on Windows too to get the same
configuration.
---
 Utilities/cmexpat/CMakeLists.txt       | 16 ----------------
 Utilities/cmexpat/expat_config.h.cmake |  6 +++---
 Utilities/cmexpat/lib/winconfig.h      | 10 +---------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/Utilities/cmexpat/CMakeLists.txt b/Utilities/cmexpat/CMakeLists.txt
index ac5d66047..f7d56e311 100644
--- a/Utilities/cmexpat/CMakeLists.txt
+++ b/Utilities/cmexpat/CMakeLists.txt
@@ -5,22 +5,6 @@ project(expat)
 
 cmake_minimum_required(VERSION 2.6)
 
-# configuration options
-set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point")
-option(XML_DTD "Define to make parameter entity parsing functionality available" ON)
-option(XML_NS "Define to make XML Namespaces functionality available" ON)
-
-if(XML_DTD)
-    set(XML_DTD 1)
-else(XML_DTD)
-    set(XML_DTD 0)
-endif(XML_DTD)
-if(XML_NS)
-    set(XML_NS 1)
-else(XML_NS)
-    set(XML_NS 0)
-endif(XML_NS)
-
 include(ConfigureChecks.cmake)
 
 include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib)
diff --git a/Utilities/cmexpat/expat_config.h.cmake b/Utilities/cmexpat/expat_config.h.cmake
index bd2ade033..ad540d604 100644
--- a/Utilities/cmexpat/expat_config.h.cmake
+++ b/Utilities/cmexpat/expat_config.h.cmake
@@ -56,13 +56,13 @@
 
 /* Define to specify how much context to retain around the current parse
    point. */
-#cmakedefine XML_CONTEXT_BYTES @XML_CONTEXT_BYTES@
+#define XML_CONTEXT_BYTES 1024
 
 /* Define to make parameter entity parsing functionality available. */
-#cmakedefine XML_DTD
+/* #undef XML_DTD */
 
 /* Define to make XML Namespaces functionality available. */
-#cmakedefine XML_NS
+/* #undef XML_NS */
 
 /* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */
 #ifdef _MSC_VER
diff --git a/Utilities/cmexpat/lib/winconfig.h b/Utilities/cmexpat/lib/winconfig.h
index c1b791d62..908d71480 100644
--- a/Utilities/cmexpat/lib/winconfig.h
+++ b/Utilities/cmexpat/lib/winconfig.h
@@ -17,14 +17,6 @@
 #include <memory.h>
 #include <string.h>
 
-#define XML_NS 1
-#define XML_DTD 1
-#define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#define BYTEORDER 1234
-
-/* Windows has memmove() available. */
-#define HAVE_MEMMOVE
+#include "expat_config.h"
 
 #endif /* ndef WINCONFIG_H */