summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-08-27 18:35:34 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-08-27 18:35:34 (GMT)
commit8d80a9055e0417328c7bb326eab228cb7819d46b (patch)
tree9588a2a32a8cb6e1c9abdfdee6af56408d382af0 /configure
parent3b5ce4b88a072fac9298ea599e99ecd9cf973804 (diff)
downloadCMake-8d80a9055e0417328c7bb326eab228cb7819d46b.zip
CMake-8d80a9055e0417328c7bb326eab228cb7819d46b.tar.gz
CMake-8d80a9055e0417328c7bb326eab228cb7819d46b.tar.bz2
ENH: clean up sgi build and use non-broken autoconf
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 8 insertions, 5 deletions
diff --git a/configure b/configure
index e58f523..b97a4ee 100755
--- a/configure
+++ b/configure
@@ -926,6 +926,7 @@ else
fi
CMAKE_ANSI_CFLAGS=""
+CMAKE_ANSI_CXXFLAGS=""
# on hp use -Aa for ansi
if test $ac_cv_prog_gxx = no; then
case $system in
@@ -945,7 +946,7 @@ case $system in
echo 'void f(){}' > conftest.c
if test -z "`${CC} -LANG:std -c conftest.c 2>&1`"; then
echo "$ac_t""yes" 1>&6
- CMAKE_ANSI_CFLAGS="-LANG:std"
+ CMAKE_ANSI_CXXFLAGS="-LANG:std"
else
echo "$ac_t""no" 1>&6
fi
@@ -955,6 +956,7 @@ esac
fi
+
# if we are not running g++ then we might need some other flags
# to get the templates compiled correctly
CMAKE_TEMPLATE_FLAGS=""
@@ -983,7 +985,7 @@ fi
# ansi stream files (without the .h)
if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
-echo "configure:987: checking ansi standard C++ stream headers " >&5
+echo "configure:989: checking ansi standard C++ stream headers " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <iostream>
@@ -1002,7 +1004,7 @@ 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:1006: checking ansi standard namespace support " >&5
+echo "configure:1008: checking ansi standard namespace support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <list>
@@ -1022,7 +1024,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:1026: checking ansi for scope support " >&5
+echo "configure:1028: checking ansi for scope support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
void foo() { for(int i;;); for(int i;;); }
@@ -1044,7 +1046,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:1048: checking for $ac_word" >&5
+echo "configure:1050: 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
@@ -1217,6 +1219,7 @@ s%@CC@%$CC%g
s%@CXX@%$CXX%g
s%@CMAKE_ROOT_DIR@%$CMAKE_ROOT_DIR%g
s%@CMAKE_ANSI_CFLAGS@%$CMAKE_ANSI_CFLAGS%g
+s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g
s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g
s%@RUNMAKE@%$RUNMAKE%g