generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify SGI C compiler check

Browse Source
This commit is contained in:
Yang Tse
2008-10-10 05:09:28 +00:00
parent 8cd76d3921
commit 4f6f334f41
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ares/m4/cares-compilers.m4
View File

@@ -16,7 +16,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 15 # serial 18
dnl CARES_CHECK_COMPILER dnl CARES_CHECK_COMPILER
@@ -220,21 +220,12 @@ dnl Verify if the C compiler being used is SGI's.
AC_DEFUN([CARES_CHECK_COMPILER_SGI], [ AC_DEFUN([CARES_CHECK_COMPILER_SGI], [
AC_MSG_CHECKING([whether we are using the SGI C compiler]) AC_MSG_CHECKING([whether we are using the SGI C compiler])
CURL_CHECK_DEF([_SGI_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([__GNUC__], [], [silent]) CURL_CHECK_DEF([__GNUC__], [], [silent])
CURL_CHECK_DEF([__sgi], [], [silent]) CURL_CHECK_DEF([__sgi], [], [silent])
if test "$curl_cv_have_def___GNUC__" = "no"; then if test "$curl_cv_have_def___GNUC__" = "no" &&
if test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes"; then test "$curl_cv_have_def___sgi" = "yes"; then
compiler_id="SGIC"
fi
if test "$curl_cv_have_def__COMPILER_VERSION" = "yes" &&
test "$curl_cv_have_def___sgi" = "yes"; then
compiler_id="SGIC"
fi
fi
if test "$compiler_id" = "SGIC"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
compiler_id="SGIC"
flags_dbg_all="-g -g0 -g1 -g2 -g3" flags_dbg_all="-g -g0 -g1 -g2 -g3"
flags_dbg_yes="-g" flags_dbg_yes="-g"
flags_dbg_off="-g0" flags_dbg_off="-g0"

17
m4/curl-compilers.m4
View File

@@ -22,7 +22,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 14 # serial 17
dnl CURL_CHECK_COMPILER dnl CURL_CHECK_COMPILER
@@ -226,21 +226,12 @@ dnl Verify if the C compiler being used is SGI's.
AC_DEFUN([CURL_CHECK_COMPILER_SGI], [ AC_DEFUN([CURL_CHECK_COMPILER_SGI], [
AC_MSG_CHECKING([whether we are using the SGI C compiler]) AC_MSG_CHECKING([whether we are using the SGI C compiler])
CURL_CHECK_DEF([_SGI_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([_COMPILER_VERSION], [], [silent])
CURL_CHECK_DEF([__GNUC__], [], [silent]) CURL_CHECK_DEF([__GNUC__], [], [silent])
CURL_CHECK_DEF([__sgi], [], [silent]) CURL_CHECK_DEF([__sgi], [], [silent])
if test "$curl_cv_have_def___GNUC__" = "no"; then if test "$curl_cv_have_def___GNUC__" = "no" &&
if test "$curl_cv_have_def__SGI_COMPILER_VERSION" = "yes"; then test "$curl_cv_have_def___sgi" = "yes"; then
compiler_id="SGIC"
fi
if test "$curl_cv_have_def__COMPILER_VERSION" = "yes" &&
test "$curl_cv_have_def___sgi" = "yes"; then
compiler_id="SGIC"
fi
fi
if test "$compiler_id" = "SGIC"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
compiler_id="SGIC"
flags_dbg_all="-g -g0 -g1 -g2 -g3" flags_dbg_all="-g -g0 -g1 -g2 -g3"
flags_dbg_yes="-g" flags_dbg_yes="-g"
flags_dbg_off="-g0" flags_dbg_off="-g0"