summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-01-30 11:19:59 (GMT)
committerYang Tse <yangsita@gmail.com>2013-01-30 11:25:53 (GMT)
commit422717ba6f01052418688305b1917dc1c4ef2aea (patch)
tree9ee5097412d8b1336650775143e05ac84963f252
parente03b5288ec71f6a280c69c346c5c68bb56a88287 (diff)
downloadc-ares-422717ba6f01052418688305b1917dc1c4ef2aea.zip
c-ares-422717ba6f01052418688305b1917dc1c4ef2aea.tar.gz
c-ares-422717ba6f01052418688305b1917dc1c4ef2aea.tar.bz2
zz40-xc-ovr.m4: fix 'wc' detection
- Take into account that 'wc' may return leading spaces. - Set internationalization behavior variables. Tor Arntsen analyzed and reported the issue. URL: http://curl.haxx.se/mail/lib-2013-01/0351.html
-rw-r--r--m4/zz40-xc-ovr.m417
1 files changed, 14 insertions, 3 deletions
diff --git a/m4/zz40-xc-ovr.m4 b/m4/zz40-xc-ovr.m4
index 57f28ae..b5e9dfe 100644
--- a/m4/zz40-xc-ovr.m4
+++ b/m4/zz40-xc-ovr.m4
@@ -53,6 +53,17 @@ xc_configure_preamble_ver_minor='XC_CONFIGURE_PREAMBLE_VER_MINOR'
xc_configure_preamble_prev_IFS=$IFS
+#
+# Set internationalization behavior variables
+#
+
+LANG='C'
+LC_ALL='C'
+LANGUAGE='C'
+export LANG
+export LC_ALL
+export LANGUAGE
+
xc_msg_warn='configure: WARNING:'
xc_msg_abrt='Can not continue.'
xc_msg_err='configure: error:'
@@ -276,14 +287,14 @@ dnl is found within 'PATH', otherwise aborts execution.
AC_DEFUN([_XC_CFG_PRE_BASIC_CHK_UTIL_WC],
[dnl
-AC_REQUIRE([_XC_CFG_PRE_BASIC_CHK_VAR_PATH])dnl
+AC_REQUIRE([_XC_CFG_PRE_BASIC_CHK_UTIL_TR])dnl
#
# Verify that 'wc' utility is found within 'PATH', otherwise abort.
#
xc_tst_str='unknown unknown unknown unknown'
xc_tst_str=`echo "$xc_tst_str" 2>/dev/null \
- | wc -w 2>/dev/null`
+ | wc -w 2>/dev/null | tr -d ' ' 2>/dev/null`
case "x$xc_tst_str" in @%:@ ((
x4)
:
@@ -311,7 +322,7 @@ AC_REQUIRE([_XC_CFG_PRE_BASIC_CHK_UTIL_WC])dnl
#
xc_tst_str='unknown'
-xc_tst_str=`cat <<_EOT 2>/dev/null | wc -l 2>/dev/null
+xc_tst_str=`cat <<_EOT 2>/dev/null | wc -l 2>/dev/null | tr -d ' ' 2>/dev/null
unknown
unknown
unknown