# # patch "ChangeLog" # from [210302bc1a12a8eca1eba1772e2c765a76946385] # to [d361379fed175013c9eb5bd3f0c4f69e8f80b592] # # patch "configure.ac" # from [938732325b2aba502da74aee01ba63fc1748c0f4] # to [921925f242273eda5169fa87ffcfd4251b32b656] # ======================================================================== --- ChangeLog 210302bc1a12a8eca1eba1772e2c765a76946385 +++ ChangeLog d361379fed175013c9eb5bd3f0c4f69e8f80b592 @@ -1,3 +1,8 @@ +2005-08-14 Nathaniel Smith + + * configure.ac (BOOST_VERSION_CHECK, BOOST_FIX_VERSION): Fix for + cross-compilation. (Thanks to John Bowler .) + 2005-08-14 Matthew Gregan * testsuite.at: Don't use agraph. ======================================================================== --- configure.ac 938732325b2aba502da74aee01ba63fc1748c0f4 +++ configure.ac 921925f242273eda5169fa87ffcfd4251b32b656 @@ -88,9 +88,14 @@ AC_DEFUN([BOOST_VERSION_CHECK], [AC_CACHE_CHECK([boost version 1.32 or newer], ac_cv_version_boost, [ - AC_TRY_RUN( + AC_COMPILE_IFELSE( [#include - int main() { return (BOOST_VERSION < 103200); }], + #if BOOST_VERSION >= 103200 + int main() { return 0; } + #else + #error boost version is too old + #endif + ], ac_cv_version_boost=yes, ac_cv_version_boost=no) ]) @@ -107,9 +112,14 @@ AC_DEFUN([BOOST_FIX_VERSION], [AC_CACHE_CHECK([if boost requires extra flags to compile], ac_fix_boost, [ - AC_TRY_RUN( + AC_COMPILE_IFELSE( [#include - int main() { return (BOOST_VERSION != 103200); }], + #if BOOST_VERSION == 103200 + int main() { return 0; } + #else + #error boost version is not 1.32.0 + #endif + ], ac_fix_boost=yes, ac_fix_boost=no) ])