summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure7
-rw-r--r--configure.in5
2 files changed, 5 insertions, 7 deletions
diff --git a/configure b/configure
index 78cf1c84f2..6aa55371d0 100755
--- a/configure
+++ b/configure
@@ -1035,7 +1035,7 @@ echo "configure:1034: checking ansi standard C++ stream headers " >&5
cat > conftest.cc <<!
#include <iostream>
!
- if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+ if test -z "`${CXX} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
echo "$ac_t""yes" 1>&6
else
cat >> confdefs.h <<\EOF
@@ -1048,15 +1048,14 @@ fi
# check to see if stl is in the std namespace
if test $ac_cv_prog_gxx = no; then
- echo "******"
echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
-echo "configure:1054: checking ansi standard namespace support " >&5
+echo "configure:1053: checking ansi standard namespace support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <list>
void foo() { std::list<int> l; }
!
- if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+ if test -z "`${CXX} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
echo "$ac_t""yes" 1>&6
else
cat >> confdefs.h <<\EOF
diff --git a/configure.in b/configure.in
index a3a5ee2c28..9312a5fa83 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ if test $ac_cv_prog_gxx = no; then
cat > conftest.cc <<!
#include <iostream>
!
- if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+ if test -z "`${CXX} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
echo "$ac_t""yes" 1>&6
else
AC_DEFINE(CMAKE_NO_ANSI_STREAM_HEADERS)
@@ -78,14 +78,13 @@ fi
# check to see if stl is in the std namespace
if test $ac_cv_prog_gxx = no; then
- echo "******"
AC_MSG_CHECKING( ansi standard namespace support )
rm -rf conftest.*
cat > conftest.cc <<!
#include <list>
void foo() { std::list<int> l; }
!
- if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+ if test -z "`${CXX} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
echo "$ac_t""yes" 1>&6
else
AC_DEFINE(CMAKE_NO_STD_NAMESPACE)