diff options
| -rwxr-xr-x | Templates/cxxconfigure | 28 | ||||
| -rwxr-xr-x | configure | 26 |
2 files changed, 25 insertions, 29 deletions
diff --git a/Templates/cxxconfigure b/Templates/cxxconfigure index c168a22..f9c47fa 100755 --- a/Templates/cxxconfigure +++ b/Templates/cxxconfigure @@ -778,27 +778,25 @@ echo "configure:768: checking ansi standard C++ stream headers " >&5 fi -# check non-g++ compilers to see if they have std::stringstream -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 -echo "configure:785: checking for ansi standard C++ stringstream " >&5 - rm -rf conftest.* - cat > conftest.cc <<! +# check compilers to see if they have std::stringstream +echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 +echo "configure:784: checking for ansi standard C++ stringstream " >&5 +rm -rf conftest.* +cat > conftest.cc <<! #include <sstream> ! - if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - else - CMAKE_NO_ANSI_STRING_STREAM="1" - echo "$ac_t""no" 1>&6 - fi +if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then + echo "$ac_t""yes" 1>&6 +else + CMAKE_NO_ANSI_STRING_STREAM="1" + echo "$ac_t""no" 1>&6 fi # check to see if stl is in the std namespace if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 -echo "configure:802: checking ansi standard namespace support " >&5 +echo "configure:800: checking ansi standard namespace support " >&5 rm -rf conftest.* cat > conftest.cc <<! #include <list> @@ -816,7 +814,7 @@ fi # check to see if for scoping is supported if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 -echo "configure:820: checking ansi for scope support " >&5 +echo "configure:818: checking ansi for scope support " >&5 rm -rf conftest.* cat > conftest.cc <<! void foo() { for(int i;;); for(int i;;); } @@ -837,7 +835,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:841: checking for $ac_word" >&5 +echo "configure:839: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -999,28 +999,26 @@ EOF fi # check non-g++ compilers to see if they have std::stringstream -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 -echo "configure:1005: checking for ansi standard C++ stringstream " >&5 - rm -rf conftest.* - cat > conftest.cc <<! +echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 +echo "configure:1004: checking for ansi standard C++ stringstream " >&5 +rm -rf conftest.* +cat > conftest.cc <<! #include <sstream> ! - if test -z "`${CXX} $CMAKE_ANSI_CXXFLAGS $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - else - cat >> confdefs.h <<\EOF +if test -z "`${CXX} $CMAKE_ANSI_CXXFLAGS $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then + echo "$ac_t""yes" 1>&6 +else + cat >> confdefs.h <<\EOF #define CMAKE_NO_ANSI_STRING_STREAM 1 EOF - echo "$ac_t""no" 1>&6 - fi + echo "$ac_t""no" 1>&6 fi # check to see if stl is in the std namespace if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 -echo "configure:1024: checking ansi standard namespace support " >&5 +echo "configure:1022: checking ansi standard namespace support " >&5 rm -rf conftest.* cat > conftest.cc <<! #include <list> @@ -1040,7 +1038,7 @@ fi # check to see if for scoping is supported if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 -echo "configure:1044: checking ansi for scope support " >&5 +echo "configure:1042: checking ansi for scope support " >&5 rm -rf conftest.* cat > conftest.cc <<! void foo() { for(int i;;); for(int i;;); } @@ -1062,7 +1060,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1066: checking for $ac_word" >&5 +echo "configure:1064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else |