adjust SGI MIPSpro C detection

diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index 0a90d07904b00ae63c282537071e6216d854a51e..7a1cbd79db4a7f7ddf006c69f989cfda0c77b3d4 100644 (file)
--- 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 580be220bf05855200fba21d405c182437e3cc85..dac93b985cfabc288ed43c164902eed2b0338dbf 100644 (file)
--- 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"