Bläddra i källkod

ENH: Re-ran autoconf to include changes to corresponding configure input. This adds a test for the availability of sstream.

Brad King 23 år sedan
förälder
incheckning
27a2cad0fc
2 ändrade filer med 45 tillägg och 8 borttagningar
  1. 22 4
      Templates/cxxconfigure
  2. 23 4
      configure

+ 22 - 4
Templates/cxxconfigure

@@ -760,7 +760,7 @@ fi
 
 
 
 
 
 
-# check no g++ compilers to see if they have the standard 
+# check non-g++ compilers to see if they have the standard 
 # ansi stream files (without the .h)
 # ansi stream files (without the .h)
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
   echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
@@ -778,10 +778,27 @@ echo "configure:768: checking ansi standard C++ stream headers " >&5
 fi
 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 <<!
+#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
+fi
+
+
 # check to see if stl is in the std namespace
 # check to see if stl is in the std namespace
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
   echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
-echo "configure:785: checking ansi standard namespace support " >&5 
+echo "configure:802: checking ansi standard namespace support " >&5 
   rm -rf conftest.*
   rm -rf conftest.*
   cat > conftest.cc <<!
   cat > conftest.cc <<!
 #include <list>
 #include <list>
@@ -799,7 +816,7 @@ fi
 # check to see if for scoping is supported
 # check to see if for scoping is supported
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
   echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
-echo "configure:803: checking ansi for scope support " >&5 
+echo "configure:820: checking ansi for scope support " >&5 
   rm -rf conftest.*
   rm -rf conftest.*
   cat > conftest.cc <<!
   cat > conftest.cc <<!
 void foo() { for(int i;;); for(int i;;); }
 void foo() { for(int i;;); for(int i;;); }
@@ -820,7 +837,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:824: checking for $ac_word" >&5
+echo "configure:841: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then
 if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 else
@@ -1064,6 +1081,7 @@ s%@CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION@%$CMAKE_NO_EXPLICIT_TEMPLATE_INSTANT
 s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g
 s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g
 s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g
 s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g
 s%@CMAKE_NO_ANSI_STREAM_HEADERS@%$CMAKE_NO_ANSI_STREAM_HEADERS%g
 s%@CMAKE_NO_ANSI_STREAM_HEADERS@%$CMAKE_NO_ANSI_STREAM_HEADERS%g
+s%@CMAKE_NO_ANSI_STRING_STREAM@%$CMAKE_NO_ANSI_STRING_STREAM%g
 s%@CMAKE_NO_STD_NAMESPACE@%$CMAKE_NO_STD_NAMESPACE%g
 s%@CMAKE_NO_STD_NAMESPACE@%$CMAKE_NO_STD_NAMESPACE%g
 s%@CMAKE_NO_ANSI_FOR_SCOPE@%$CMAKE_NO_ANSI_FOR_SCOPE%g
 s%@CMAKE_NO_ANSI_FOR_SCOPE@%$CMAKE_NO_ANSI_FOR_SCOPE%g
 s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g
 s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g

+ 23 - 4
configure

@@ -978,7 +978,7 @@ fi
 
 
 
 
 
 
-# check no g++ compilers to see if they have the standard 
+# check non-g++ compilers to see if they have the standard 
 # ansi stream files (without the .h)
 # ansi stream files (without the .h)
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
   echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
@@ -998,10 +998,29 @@ EOF
   fi
   fi
 fi
 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 <<!
+#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
+#define CMAKE_NO_ANSI_STRING_STREAM 1
+EOF
+
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+
 # check to see if stl is in the std namespace
 # check to see if stl is in the std namespace
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
   echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
-echo "configure:1005: checking ansi standard namespace support " >&5 
+echo "configure:1024: checking ansi standard namespace support " >&5 
   rm -rf conftest.*
   rm -rf conftest.*
   cat > conftest.cc <<!
   cat > conftest.cc <<!
 #include <list>
 #include <list>
@@ -1021,7 +1040,7 @@ fi
 # check to see if for scoping is supported
 # check to see if for scoping is supported
 if test $ac_cv_prog_gxx = no; then
 if test $ac_cv_prog_gxx = no; then
   echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
   echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
-echo "configure:1025: checking ansi for scope support " >&5 
+echo "configure:1044: checking ansi for scope support " >&5 
   rm -rf conftest.*
   rm -rf conftest.*
   cat > conftest.cc <<!
   cat > conftest.cc <<!
 void foo() { for(int i;;); for(int i;;); }
 void foo() { for(int i;;); for(int i;;); }
@@ -1043,7 +1062,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1047: checking for $ac_word" >&5
+echo "configure:1066: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then
 if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 else