mirror of https://github.com/odrling/Aegisub
Fix compilation with non-bleeding edge boost
This commit is contained in:
parent
2f5bf396e7
commit
526b670120
|
@ -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)
|
||||
|
||||
|
|
|
@ -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_SPIRIT_HOME_PHOENIX_VERSION_HPP
|
||||
#include <boost/spirit/home/phoenix/statement.hpp>
|
||||
#else
|
||||
#include <boost/phoenix/statement.hpp>
|
||||
#endif
|
||||
|
||||
BOOST_FUSION_ADAPT_STRUCT(
|
||||
agi::Color,
|
||||
|
|
Loading…
Reference in New Issue