From e35d48bffbc56f827683ab4583560172011b97de Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 24 Jun 2005 11:48:29 +0000 Subject: [PATCH] Fix configure script: even with BOOST_NO_CONFIG defined, some options get automatically defined in suffix.hpp, we need to include the tests even if this is the case. [SVN r29769] --- configure | 3 ++- tools/configure.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1e290ac1..b37f51e9 100644 --- a/configure +++ b/configure @@ -2207,7 +2207,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include "test.hpp" -#ifndef $macroname +#if !defined($macroname) || defined(BOOST_NO_CONFIG) #include "boost_$basename.ipp" #else namespace ${namespace} = empty_boost; @@ -3338,5 +3338,6 @@ fi + diff --git a/tools/configure.in b/tools/configure.in index 21110cd2..706cbaea 100644 --- a/tools/configure.in +++ b/tools/configure.in @@ -168,7 +168,7 @@ for file in $boost_base/libs/config/test/boost_no*.ipp; do #include #include "test.hpp" -#ifndef $macroname +#if !defined($macroname) || defined(BOOST_NO_CONFIG) #include "boost_$basename.ipp" #else namespace ${namespace} = empty_boost; @@ -439,5 +439,6 @@ fi +