aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-08-09 17:01:17 +0000
committerYang Tse <yangsita@gmail.com>2008-08-09 17:01:17 +0000
commit63818f84889addb3685cd0ab260d1ca21d2138a3 (patch)
tree45ef8aae3e99de505496bad4dc74bdb181f7a1ee
parent8af61cdb669a791d64675701c830affb06b975cd (diff)
Fix IBM C and DEC/Compaq C compiler detection
-rw-r--r--ares/configure.ac6
-rw-r--r--configure.ac6
2 files changed, 4 insertions, 8 deletions
diff --git a/ares/configure.ac b/ares/configure.ac
index 34888873d..a4361c31c 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 2c150038e..afc8db445 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