diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-01-30 12:19:23 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-01-30 12:25:22 +0100 |
| commit | 38131d415bd4f8b26db4fdebbfd5b34f41d2a17b (patch) | |
| tree | bdef1e099349bf94fc0cf741aaca7a93f4295ab1 /m4 | |
| parent | c7b6e43ef8dd3e133bcb251b6b2c23b7492c734c (diff) | |
| download | curl-38131d415bd4f8b26db4fdebbfd5b34f41d2a17b.tar.gz | |
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
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/zz40-xc-ovr.m4 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/m4/zz40-xc-ovr.m4 b/m4/zz40-xc-ovr.m4 index 57f28ae64..b5e9dfeb9 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 |