From: Yang Tse <yangsita@gmail.com>
Date: Sat, 9 Aug 2008 17:01:17 +0000 (+0000)
Subject: Fix IBM C and DEC/Compaq C compiler detection
X-Git-Tag: curl-7_19_0~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63818f84889addb3685cd0ab260d1ca21d2138a3;p=thirdparty%2Fcurl.git

Fix IBM C and DEC/Compaq C compiler detection
---

diff --git a/ares/configure.ac b/ares/configure.ac
index 34888873d8..a4361c31c6 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -213,9 +213,7 @@ esac
 
 AC_MSG_CHECKING([whether we are using the IBM C compiler])
 CURL_CHECK_DEF([__IBMC__], [], [silent])
-CURL_CHECK_DEF([__IBMCPP__], [], [silent])
-if test "$curl_cv_have_def___IBMC__" = "yes" ||
-  test "$curl_cv_have_def___IBMCPP__" = "yes"; then
+if test "$curl_cv_have_def___IBMC__" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Ensure that compiler optimizations are always thread-safe.
   CFLAGS="$CFLAGS -qthreaded"
@@ -234,7 +232,7 @@ fi
 AC_MSG_CHECKING([whether we are using the DEC/Compaq C compiler])
 CURL_CHECK_DEF([__DECC], [], [silent])
 CURL_CHECK_DEF([__DECC_VER], [], [silent])
-if test "$curl_cv_have_def___DECC" = "yes" ||
+if test "$curl_cv_have_def___DECC" = "yes" &&
   test "$curl_cv_have_def___DECC_VER" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Select strict ANSI C compiler mode
diff --git a/configure.ac b/configure.ac
index 2c150038e9..afc8db4458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,9 +280,7 @@ esac
 
 AC_MSG_CHECKING([whether we are using the IBM C compiler])
 CURL_CHECK_DEF([__IBMC__], [], [silent])
-CURL_CHECK_DEF([__IBMCPP__], [], [silent])
-if test "$curl_cv_have_def___IBMC__" = "yes" ||
-  test "$curl_cv_have_def___IBMCPP__" = "yes"; then
+if test "$curl_cv_have_def___IBMC__" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Ensure that compiler optimizations are always thread-safe.
   CFLAGS="$CFLAGS -qthreaded"
@@ -301,7 +299,7 @@ fi
 AC_MSG_CHECKING([whether we are using the DEC/Compaq C compiler])
 CURL_CHECK_DEF([__DECC], [], [silent])
 CURL_CHECK_DEF([__DECC_VER], [], [silent])
-if test "$curl_cv_have_def___DECC" = "yes" ||
+if test "$curl_cv_have_def___DECC" = "yes" &&
   test "$curl_cv_have_def___DECC_VER" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Select strict ANSI C compiler mode