From bb4f8237fdd3d8fc1d9819cbe1a0628584e0eab0 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 18 Dec 2001 21:00:52 -0500
Subject: [PATCH] -LANG:std should be default on sgi for ansi CXX Flags
---
Templates/configure | 20 ++++++--------------
Templates/configure.in | 10 +---------
configure | 18 +++++-------------
configure.in | 10 +---------
4 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/Templates/configure b/Templates/configure
index b6aa18fcd7..2bc48e9150 100755
--- a/Templates/configure
+++ b/Templates/configure
@@ -2990,15 +2990,7 @@ case $system in
rm -f conftest*
;;
IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
- echo $ac_n "checking whether ${CC} accepts -LANG:std""... $ac_c" 1>&6
- 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_CXXFLAGS="-LANG:std"
- else
- echo "$ac_t""no" 1>&6
- fi
- rm -f conftest*
+ CMAKE_ANSI_CXXFLAGS="-LANG:std"
;;
esac
fi
@@ -3026,7 +3018,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:3030: checking ansi standard C++ stream headers " >&5
+echo "configure:3022: checking ansi standard C++ stream headers " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <iostream>
@@ -3043,7 +3035,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:3047: checking ansi standard namespace support " >&5
+echo "configure:3039: checking ansi standard namespace support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <list>
@@ -3061,7 +3053,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:3065: checking ansi for scope support " >&5
+echo "configure:3057: checking ansi for scope support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
void foo() { for(int i;;); for(int i;;); }
@@ -3086,7 +3078,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:3090: checking for $ac_word" >&5
+echo "configure:3082: 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
@@ -3126,7 +3118,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:3130: checking for $ac_word" >&5
+echo "configure:3122: 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
diff --git a/Templates/configure.in b/Templates/configure.in
index bf46054030..4497538639 100644
--- a/Templates/configure.in
+++ b/Templates/configure.in
@@ -567,15 +567,7 @@ case $system in
rm -f conftest*
;;
IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
- echo $ac_n "checking whether ${CC} accepts -LANG:std""... $ac_c" 1>&6
- 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_CXXFLAGS="-LANG:std"
- else
- echo "$ac_t""no" 1>&6
- fi
- rm -f conftest*
+ CMAKE_ANSI_CXXFLAGS="-LANG:std"
;;
esac
fi
diff --git a/configure b/configure
index 70e1aec480..4770e1537d 100755
--- a/configure
+++ b/configure
@@ -942,15 +942,7 @@ case $system in
rm -f conftest*
;;
IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
- echo $ac_n "checking whether ${CC} accepts -LANG:std""... $ac_c" 1>&6
- 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_CXXFLAGS="-LANG:std"
- else
- echo "$ac_t""no" 1>&6
- fi
- rm -f conftest*
+ CMAKE_ANSI_CXXFLAGS="-LANG:std"
;;
esac
fi
@@ -961,7 +953,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:965: checking ansi standard C++ stream headers " >&5
+echo "configure:957: checking ansi standard C++ stream headers " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <iostream>
@@ -980,7 +972,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:984: checking ansi standard namespace support " >&5
+echo "configure:976: checking ansi standard namespace support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
#include <list>
@@ -1000,7 +992,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:1004: checking ansi for scope support " >&5
+echo "configure:996: checking ansi for scope support " >&5
rm -rf conftest.*
cat > conftest.cc <<!
void foo() { for(int i;;); for(int i;;); }
@@ -1022,7 +1014,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:1026: checking for $ac_word" >&5
+echo "configure:1018: 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
diff --git a/configure.in b/configure.in
index 1c67a4fecf..3ebbce7149 100644
--- a/configure.in
+++ b/configure.in
@@ -57,15 +57,7 @@ case $system in
rm -f conftest*
;;
IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
- echo $ac_n "checking whether ${CC} accepts -LANG:std""... $ac_c" 1>&6
- 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_CXXFLAGS="-LANG:std"
- else
- echo "$ac_t""no" 1>&6
- fi
- rm -f conftest*
+ CMAKE_ANSI_CXXFLAGS="-LANG:std"
;;
esac
fi
--
GitLab