Merge branch 'build-sys' of https://github.com/kolyshkin/util-linux
* 'build-sys' of https://github.com/kolyshkin/util-linux: build-sys: allow gettext 0.17 to be used build-sys: allow autoconf < 2.64 to be used
This commit is contained in:
commit
9d0655fe2d
|
@ -21,7 +21,7 @@ autopoint_fun ()
|
||||||
|
|
||||||
# check against this hardcoded set of alternative gettext versions
|
# check against this hardcoded set of alternative gettext versions
|
||||||
gt_ver=`gettext --version |\
|
gt_ver=`gettext --version |\
|
||||||
sed -n -e 's/.* \(0\.18\|0\.18\.[1-2]\)$/\1/p'`
|
sed -n -e 's/.* \(0\.17\|0\.18\|0\.18\.[1-2]\)$/\1/p'`
|
||||||
|
|
||||||
if [ -n "$gt_ver" ]; then
|
if [ -n "$gt_ver" ]; then
|
||||||
echo "warning: forcing autopoint to use old gettext $gt_ver"
|
echo "warning: forcing autopoint to use old gettext $gt_ver"
|
||||||
|
|
26
m4/ul.m4
26
m4/ul.m4
|
@ -1,3 +1,29 @@
|
||||||
|
dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64
|
||||||
|
dnl This allows us to run with earlier Autoconfs as well.
|
||||||
|
dnl
|
||||||
|
dnl m4_ifblank(COND, [IF-BLANK], [IF-TEXT])
|
||||||
|
dnl m4_ifnblank(COND, [IF-TEXT], [IF-BLANK])
|
||||||
|
dnl ----------------------------------------
|
||||||
|
dnl If COND is empty, or consists only of blanks (space, tab, newline),
|
||||||
|
dnl then expand IF-BLANK, otherwise expand IF-TEXT. This differs from
|
||||||
|
dnl m4_ifval only if COND has just whitespace, but it helps optimize in
|
||||||
|
dnl spite of users who mistakenly leave trailing space after what they
|
||||||
|
dnl thought was an empty argument:
|
||||||
|
dnl macro(
|
||||||
|
dnl []
|
||||||
|
dnl )
|
||||||
|
dnl
|
||||||
|
dnl Writing one macro in terms of the other causes extra overhead, so
|
||||||
|
dnl we inline both definitions.
|
||||||
|
ifdef([m4_ifblank],[],[
|
||||||
|
m4_define([m4_ifblank],
|
||||||
|
[m4_if(m4_translit([[$1]], [ ][ ][
|
||||||
|
]), [], [$2], [$3])])])
|
||||||
|
|
||||||
|
ifdef([m4_ifnblank],[],[
|
||||||
|
m4_define([m4_ifnblank],
|
||||||
|
[m4_if(m4_translit([[$1]], [ ][ ][
|
||||||
|
]), [], [$3], [$2])])])
|
||||||
|
|
||||||
dnl UL_PKG_STATIC(VARIABLE, MODULES)
|
dnl UL_PKG_STATIC(VARIABLE, MODULES)
|
||||||
dnl
|
dnl
|
||||||
|
|
Loading…
Reference in New Issue