From 1745177b6c050229e629a9e5acf65a8f43ad3c86 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 11 Mar 2014 11:28:49 -0700
Subject: [PATCH] Fix compilation with non-bleeding edge boost

---
 configure.ac                 | 5 +++++
 libaegisub/common/parser.cpp | 7 +++++++
 vendor/boost                 | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8e495a9b1..aa62633fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,11 @@ AX_BOOST_REGEX
 AX_BOOST_SYSTEM
 AX_BOOST_THREAD
 
+cppflags_bak="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CHECK_HEADERS([boost/spirit/home/phoenix/version.hpp])
+CPPFLAGS=$cppflags_bak
+
 PKG_CHECK_MODULES(ICU_UC, icu-uc >= icu_required_version)
 PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version)
 
diff --git a/libaegisub/common/parser.cpp b/libaegisub/common/parser.cpp
index 3d44a0d1a..9e36db3c0 100644
--- a/libaegisub/common/parser.cpp
+++ b/libaegisub/common/parser.cpp
@@ -27,7 +27,14 @@
 #include <boost/spirit/include/phoenix_fusion.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
+
+// We have to use the copy of pheonix within spirit if it exists, as the
+// standalone copy has different header guards
+#ifdef HAVE_BOOST_PHOENIX_VERSION_HPP
+#include <boost/spirit/home/phoenix/statement.hpp>
+#else
 #include <boost/phoenix/statement.hpp>
+#endif
 
 BOOST_FUSION_ADAPT_STRUCT(
 	agi::Color,
diff --git a/vendor/boost b/vendor/boost
index db6013d20..614aac8fe 160000
--- a/vendor/boost
+++ b/vendor/boost
@@ -1 +1 @@
-Subproject commit db6013d20a28dd0d96a8c21146e33f17788c4881
+Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35