aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-10-12 22:52:25 +0000
committerYang Tse <yangsita@gmail.com>2008-10-12 22:52:25 +0000
commit758939215d5351ce47e97ba17b663e0b1a197b1b (patch)
treea27f716894912eea191e1f8ce801e497af961525
parentab861e56f17ab02293c77fc221cd53931e4b3d2c (diff)
adjust SGI MIPSpro C detection
-rw-r--r--ares/m4/cares-compilers.m44
-rw-r--r--m4/curl-compilers.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index 0a90d0790..7a1cbd79d 100644
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -273,9 +273,11 @@ AC_DEFUN([CARES_CHECK_COMPILER_SGI_MIPSpro_C], [
AC_BEFORE([$0],[CARES_CHECK_COMPILER_SGI_MIPS_C])dnl
AC_MSG_CHECKING([if compiler is SGI MIPSpro C])
CURL_CHECK_DEF([__GNUC__], [], [silent])
+ CURL_CHECK_DEF([_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([_SGI_COMPILER_VERSION], [], [silent])
if test "$curl_cv_have_def___GNUC__" = "no" &&
- test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes"; then
+ (test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes" ||
+ test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then
AC_MSG_RESULT([yes])
compiler_id="SGI_MIPSpro_C"
flags_dbg_all="-g -g0 -g1 -g2 -g3"
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 580be220b..dac93b985 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -279,9 +279,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_SGI_MIPSpro_C], [
AC_BEFORE([$0],[CURL_CHECK_COMPILER_SGI_MIPS_C])dnl
AC_MSG_CHECKING([if compiler is SGI MIPSpro C])
CURL_CHECK_DEF([__GNUC__], [], [silent])
+ CURL_CHECK_DEF([_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([_SGI_COMPILER_VERSION], [], [silent])
if test "$curl_cv_have_def___GNUC__" = "no" &&
- test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes"; then
+ (test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes" ||
+ test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then
AC_MSG_RESULT([yes])
compiler_id="SGI_MIPSpro_C"
flags_dbg_all="-g -g0 -g1 -g2 -g3"