From 63818f84889addb3685cd0ab260d1ca21d2138a3 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 9 Aug 2008 17:01:17 +0000 Subject: [PATCH] Fix IBM C and DEC/Compaq C compiler detection --- ares/configure.ac | 6 ++---- configure.ac | 6 ++---- 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