Skip to content
Extraits de code Groupes Projets
Valider 526b6701 rédigé par Thomas Goyne's avatar Thomas Goyne
Parcourir les fichiers

Fix compilation with non-bleeding edge boost

parent 2f5bf396
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -221,6 +221,11 @@ AX_BOOST_REGEX ...@@ -221,6 +221,11 @@ AX_BOOST_REGEX
AX_BOOST_SYSTEM AX_BOOST_SYSTEM
AX_BOOST_THREAD 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_UC, icu-uc >= icu_required_version)
PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version) PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version)
......
...@@ -27,7 +27,14 @@ ...@@ -27,7 +27,14 @@
#include <boost/spirit/include/phoenix_fusion.hpp> #include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/spirit/include/lex_lexertl.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> #include <boost/spirit/home/phoenix/statement.hpp>
#else
#include <boost/phoenix/statement.hpp>
#endif
BOOST_FUSION_ADAPT_STRUCT( BOOST_FUSION_ADAPT_STRUCT(
agi::Color, agi::Color,
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter