diff --git a/configure b/configure index 152b3569..235cc780 100644 --- a/configure +++ b/configure @@ -1792,6 +1792,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +OLD_CXXFLAGS="$CXXFLAGS" + if test $enable_test = 'yes'; then CXXFLAGS="-I$boost_base -I$boost_base/libs/config/test $CXXFLAGS" else @@ -2311,15 +2313,21 @@ if test $enable_test = 'yes'; then if test "$required_defs" = ""; then echo no boost macros need to be defined +echo no boost macros need to be defined >&5 else echo the following macros need to be defined echo $required_defs +echo the following macros need to be defined >&5 +echo $required_defs >&5 fi if test "$required_undefs" = ""; then echo no boost macros need to be undefined +echo no boost macros need to be undefined >&5 else echo "the following macros need to be undef'ed" echo $required_undefs +echo "the following macros need to be undef'ed" >&5 +echo $required_undefs >&5 fi else @@ -2378,6 +2386,24 @@ done cat_conts=`cat user.hpp` +# +# post configuration step: +# +echo "$as_me:$LINENO: checking original configuration " >&5 +echo $ECHO_N "checking original configuration ... $ECHO_C" >&6 +rm -f conftest$ac_exeext +$CXX -I$boost_base $OLD_CXXFLAGS -DBOOST_NO_USER_CONFIG -o conftest$ac_exeext $LDFLAGS $boost_base/libs/config/test/config_info.cpp $LIBS >&5 2>&1 +./conftest >&5 2>&1 +echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 +echo "$as_me:$LINENO: checking new configuration " >&5 +echo $ECHO_N "checking new configuration ... $ECHO_C" >&6 +rm -f conftest$ac_exeext +$CXX -I$boost_base -I$boost_base/libs/config $OLD_CXXFLAGS -DBOOST_USER_CONFIG='"user.hpp"' -o conftest$ac_exeext $LDFLAGS $boost_base/libs/config/test/config_info.cpp $LIBS >&5 2>&1 +./conftest >&5 2>&1 +echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 + ac_config_commands="$ac_config_commands default" @@ -3017,6 +3043,9 @@ fi + + + diff --git a/test/config_info.cpp b/test/config_info.cpp index 732525bf..ab64defa 100644 --- a/test/config_info.cpp +++ b/test/config_info.cpp @@ -825,8 +825,20 @@ void print_platform_macros() void print_boost_macros() { std::cout << "Boost version " << BOOST_STRINGIZE(BOOST_VERSION) << std::endl; + // config setup macros first: + PRINT_MACRO(BOOST_USER_CONFIG); + PRINT_MACRO(BOOST_COMPILER_CONFIG); + PRINT_MACRO(BOOST_STDLIB_CONFIG); + PRINT_MACRO(BOOST_PLATFORM_CONFIG); + PRINT_MACRO(BOOST_NO_CONFIG); + PRINT_MACRO(BOOST_NO_USER_CONFIG); + PRINT_MACRO(BOOST_NO_COMPILER_CONFIG); + PRINT_MACRO(BOOST_NO_STDLIB_CONFIG); + PRINT_MACRO(BOOST_NO_PLATFORM_CONFIG); + // then defect and feature macros: PRINT_MACRO(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG); PRINT_MACRO(BOOST_DECL); + PRINT_MACRO(BOOST_DEDUCED_TYPENAME); PRINT_MACRO(BOOST_DISABLE_THREADS); PRINT_MACRO(BOOST_DISABLE_WIN32); PRINT_MACRO(BOOST_HAS_BETHREADS); @@ -840,6 +852,7 @@ void print_boost_macros() PRINT_MACRO(BOOST_HAS_MS_INT64); PRINT_MACRO(BOOST_HAS_NANOSLEEP); PRINT_MACRO(BOOST_HAS_NL_TYPES_H); + PRINT_MACRO(BOOST_HAS_NRVO); PRINT_MACRO(BOOST_HAS_PTHREAD_DELAY_NP); PRINT_MACRO(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE); PRINT_MACRO(BOOST_HAS_PTHREAD_YIELD); @@ -934,3 +947,4 @@ int main() + diff --git a/tools/configure.in b/tools/configure.in index 07cbbef0..5cb7a2d0 100644 --- a/tools/configure.in +++ b/tools/configure.in @@ -120,6 +120,8 @@ ac_ext=$use_ac_ext AC_LANG_CPLUSPLUS +OLD_CXXFLAGS="$CXXFLAGS" + if test $enable_test = 'yes'; then CXXFLAGS="-I$boost_base -I$boost_base/libs/config/test $CXXFLAGS" else @@ -297,15 +299,21 @@ if test $enable_test = 'yes'; then if test "$required_defs" = ""; then echo no boost macros need to be defined +echo no boost macros need to be defined >&5 else echo the following macros need to be defined echo $required_defs +echo the following macros need to be defined >&5 +echo $required_defs >&5 fi if test "$required_undefs" = ""; then echo no boost macros need to be undefined +echo no boost macros need to be undefined >&5 else echo "the following macros need to be undef'ed" echo $required_undefs +echo "the following macros need to be undef'ed" >&5 +echo $required_undefs >&5 fi else @@ -364,6 +372,20 @@ done cat_conts=`cat user.hpp` +# +# post configuration step: +# +AC_MSG_CHECKING(original configuration ) +rm -f conftest$ac_exeext +$CXX -I$boost_base $OLD_CXXFLAGS -DBOOST_NO_USER_CONFIG -o conftest$ac_exeext $LDFLAGS $boost_base/libs/config/test/config_info.cpp $LIBS >&5 2>&1 +./conftest >&5 2>&1 +AC_MSG_RESULT(done) +AC_MSG_CHECKING(new configuration ) +rm -f conftest$ac_exeext +$CXX -I$boost_base -I$boost_base/libs/config $OLD_CXXFLAGS -DBOOST_USER_CONFIG='"user.hpp"' -o conftest$ac_exeext $LDFLAGS $boost_base/libs/config/test/config_info.cpp $LIBS >&5 2>&1 +./conftest >&5 2>&1 +AC_MSG_RESULT(done) + AC_OUTPUT( [], [ @@ -404,6 +426,9 @@ fi + + +