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

@@ -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)

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

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 */