From 53e1fff883d2f8e80b375a7082a8e818f6a0c68e Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Sun, 22 Sep 2013 11:57:14 +0200
Subject: [PATCH 3/3] Use the system expat flag from cmake

---
 simgear/io/DAVMultiStatus.cxx  | 10 +++++++++-
 simgear/io/SVNReportParser.cxx | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/simgear/io/DAVMultiStatus.cxx b/simgear/io/DAVMultiStatus.cxx
index 5270fca..3b98c55 100644
--- a/simgear/io/DAVMultiStatus.cxx
+++ b/simgear/io/DAVMultiStatus.cxx
@@ -16,6 +16,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "DAVMultiStatus.hxx"
 
 #include <iostream>
@@ -27,7 +31,11 @@
 #include <boost/foreach.hpp>
 
 #include "simgear/debug/logstream.hxx"
-#include "simgear/xml/xmlparse.h"
+#ifdef SYSTEM_EXPAT
+#  include <expat.h>
+#else
+#  include "simgear/xml/xmlparse.h"     
+#endif
 #include "simgear/misc/strutils.hxx"
 #include "simgear/structure/exception.hxx"
 
diff --git a/simgear/io/SVNReportParser.cxx b/simgear/io/SVNReportParser.cxx
index 33b8638..47f3903 100644
--- a/simgear/io/SVNReportParser.cxx
+++ b/simgear/io/SVNReportParser.cxx
@@ -16,6 +16,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "SVNReportParser.hxx"
 
 #include <iostream>
@@ -30,7 +34,11 @@
 #include "simgear/misc/sg_path.hxx"
 #include "simgear/misc/sg_dir.hxx"
 #include "simgear/debug/logstream.hxx"
-#include "simgear/xml/xmlparse.h"
+#ifdef SYSTEM_EXPAT
+#  include <expat.h>
+#else
+#  include "simgear/xml/xmlparse.h"     
+#endif
 #include "simgear/xml/easyxml.hxx"
 #include "simgear/misc/strutils.hxx"
 #include "simgear/package/md5.h"
-- 
1.8.3.1