aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-10-10 09:14:18 +0000
committerYang Tse <yangsita@gmail.com>2008-10-10 09:14:18 +0000
commitef49850789af67ff0a393b1ac62fb819fcc8cb3e (patch)
treef2c39aa35e8d42381a1ee7e5f7d703417abdbc83
parent4f6f334f41a30a29d94a5e572a2771c1e33dff93 (diff)
1) fix bug in CONVERT_INCLUDE_TO_ISYSTEM
2) Disable SGI remark: controlling expression is constant
-rw-r--r--ares/m4/cares-compilers.m411
-rw-r--r--m4/curl-compilers.m411
2 files changed, 14 insertions, 8 deletions
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index ea0d3744c..e628d495d 100644
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 18
+# serial 19
dnl CARES_CHECK_COMPILER
@@ -251,7 +251,7 @@ AC_DEFUN([CARES_CHECK_COMPILER_SUN], [
flags_dbg_all="-g -s"
flags_dbg_yes="-g"
flags_dbg_off="-s"
- flags_opt_all="-O -xO1 -xO2 -xO3 -xO4 -xO5"
+ flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
flags_opt_yes="-xO2"
flags_opt_off=""
else
@@ -272,7 +272,7 @@ AC_DEFUN([CARES_CONVERT_INCLUDE_TO_ISYSTEM], [
tmp_has_include="no"
tmp_chg_FLAGS=$CFLAGS
for word1 in $tmp_chg_FLAGS; do
- case "$word" in
+ case "$word1" in
-I*)
tmp_has_include="yes"
;;
@@ -286,7 +286,7 @@ AC_DEFUN([CARES_CONVERT_INCLUDE_TO_ISYSTEM], [
tmp_has_include="no"
tmp_chg_FLAGS=$CPPFLAGS
for word1 in $tmp_chg_FLAGS; do
- case "$word" in
+ case "$word1" in
-I*)
tmp_has_include="yes"
;;
@@ -728,6 +728,9 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
if test "$want_warnings" = "yes"; then
dnl Perform stricter semantic and lint-like checks
tmp_CFLAGS="$tmp_CFLAGS -fullwarn"
+ dnl Disable some remarks
+ dnl #1209: controlling expression is constant
+ tmp_CFLAGS="$tmp_CFLAGS -woff 1209"
fi
;;
#
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index ffdcdfd19..0af13bbe7 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -22,7 +22,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 17
+# serial 18
dnl CURL_CHECK_COMPILER
@@ -257,7 +257,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SUN], [
flags_dbg_all="-g -s"
flags_dbg_yes="-g"
flags_dbg_off="-s"
- flags_opt_all="-O -xO1 -xO2 -xO3 -xO4 -xO5"
+ flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
flags_opt_yes="-xO2"
flags_opt_off=""
else
@@ -278,7 +278,7 @@ AC_DEFUN([CURL_CONVERT_INCLUDE_TO_ISYSTEM], [
tmp_has_include="no"
tmp_chg_FLAGS=$CFLAGS
for word1 in $tmp_chg_FLAGS; do
- case "$word" in
+ case "$word1" in
-I*)
tmp_has_include="yes"
;;
@@ -292,7 +292,7 @@ AC_DEFUN([CURL_CONVERT_INCLUDE_TO_ISYSTEM], [
tmp_has_include="no"
tmp_chg_FLAGS=$CPPFLAGS
for word1 in $tmp_chg_FLAGS; do
- case "$word" in
+ case "$word1" in
-I*)
tmp_has_include="yes"
;;
@@ -734,6 +734,9 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
if test "$want_warnings" = "yes"; then
dnl Perform stricter semantic and lint-like checks
tmp_CFLAGS="$tmp_CFLAGS -fullwarn"
+ dnl Disable some remarks
+ dnl #1209: controlling expression is constant
+ tmp_CFLAGS="$tmp_CFLAGS -woff 1209"
fi
;;
#