diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-01-08 07:44:19 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2018-04-07 19:02:33 (GMT) |
| commit | 1ce2eab963a004ba352a5cea800e2765a7c6affd (patch) | |
| tree | 2969901f6d3e42d95c58ecdd648aa00136f10375 /m4 | |
| parent | 0bcb67fa52b1318b098366fa44955f528999f4db (diff) | |
Simplify the macro for checking stat flavor a bit
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ctng_prog_stat.m4 | 12 | ||||
| -rw-r--r-- | m4/ctng_set_kconfig_option.m4 | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/m4/ctng_prog_stat.m4 b/m4/ctng_prog_stat.m4 index f7de93e..5db3469 100644 --- a/m4/ctng_prog_stat.m4 +++ b/m4/ctng_prog_stat.m4 @@ -1,5 +1,7 @@ # Check that stat(1) is present and determine the syntax for the format -# string (BSD or GNU). +# string (BSD or GNU). Defines ac_cv_stat_flavor to either GNU or BSD; +# and evaluates either IF-GNU or IF-BSD expression. +# CTNG_PROG_STAT([IF-GNU], [IF-BSD]) AC_DEFUN([CTNG_PROG_STAT], [AX_REQUIRE_DEFINED([CTNG_CHECK_PROGS_REQ]) CTNG_CHECK_PROGS_REQ([stat], [stat]) @@ -11,8 +13,12 @@ AC_DEFUN([CTNG_PROG_STAT], attr_gnu=$(stat -c '%a' conftest 2>/dev/null) rm -f conftest AS_IF([test "$attr_bsd" = "642"], - [acx_cv_stat_flavor=BSD], + [acx_cv_stat_flavor=BSD + $2 + ], [test "$attr_gnu" = "642"], - [acx_cv_stat_flavor=GNU], + [acx_cv_stat_flavor=GNU + $1 + ], [AC_MSG_ERROR([cannot determine stat(1) format option])])]) ]) diff --git a/m4/ctng_set_kconfig_option.m4 b/m4/ctng_set_kconfig_option.m4 index 9fae320..2c2968c 100644 --- a/m4/ctng_set_kconfig_option.m4 +++ b/m4/ctng_set_kconfig_option.m4 @@ -1,7 +1,7 @@ # Set the kconfig option. AC_DEFUN([CTNG_SET_KCONFIG_OPTION], [AS_IF( - [test -n "$$1"], + [test -n "$$1" -o "$2" = "y"], [AC_SUBST([KCONFIG_$1], ["def_bool y"])], [AC_SUBST([KCONFIG_$1], ["bool"])]) ]) |