diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-02-05 07:39:01 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2018-04-07 19:03:17 (GMT) |
| commit | 9238b587210c53ba51dd665ffb9ff3e13456880f (patch) | |
| tree | 9892738202b84042d190d80ecd20c64b060f8b03 /m4 | |
| parent | 576dcc3fee5b949cbf439fd95ab642dfcfe51a74 (diff) | |
WIP: autotoolization
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ctng_version_check.m4 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/m4/ctng_version_check.m4 b/m4/ctng_version_check.m4 index 472194b..703661b 100644 --- a/m4/ctng_version_check.m4 +++ b/m4/ctng_version_check.m4 @@ -4,28 +4,28 @@ # VAR; display HELP message. Try to find a version that satisfies VERSION_CHECK # regexp; if that is achieved, set CONFIG_OPT in the kconfig. Otherwise, settle # for any version found. -# Sets acx_version_VAR_ok to ':' if the version met the criterion, or false otherwise. +# Sets ctng_version_VAR_ok to ':' if the version met the criterion, or false otherwise. AC_DEFUN([CTNG_PROG_VERSION], [AS_IF([test -z "$EGREP"], [AC_MSG_ERROR([This macro can only be used after checking for EGREP])]) CTNG_WITH_DEPRECATED([$3], [$1]) AC_ARG_VAR([$1], [Specify the full path to $2]) - acx_version_$1_ok=false + ctng_version_$1_ok=false AC_CACHE_CHECK([for $3], [ac_cv_path_$1], [AC_PATH_PROGS_FEATURE_CHECK([$1], [$4], [[ver=$($ac_path_$1 --version 2>/dev/null| $EGREP $5) test -z "$ac_cv_path_$1" && ac_cv_path_$1=$ac_path_$1 - test -n "$ver" && ac_cv_path_$1="$ac_path_$1" ac_path_$1_found=: acx_version_$1_ok=:]])]) - AS_IF([test -n "$1"], - [[ver=$($ac_path_$1 --version 2>/dev/null| $EGREP $5) - test -n "$ver" && acx_version_$1_ok=:]]) + test -n "$ver" && ac_cv_path_$1="$ac_path_$1" ac_path_$1_found=: ctng_version_$1_ok=:]])]) + AS_IF([test -n "$$1"], + [[ver=$($ac_cv_path_$1 --version 2>/dev/null| $EGREP $5) + test -n "$ver" && ctng_version_$1_ok=:]]) AC_MSG_CHECKING([for $2]) - AS_IF([$acx_version_$1_ok], + AS_IF([$ctng_version_$1_ok], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) AC_SUBST([$1], [$ac_cv_path_$1]) AS_IF([test -n "$6"], - [AS_IF([$acx_version_$1_ok], [$6=y], [$6=]) + [AS_IF([$ctng_version_$1_ok], [$6=y], [$6=]) CTNG_SET_KCONFIG_OPTION([$6])]) ]) @@ -41,7 +41,7 @@ AC_DEFUN([CTNG_PROG_VERSION_REQ_ANY], # (i.e. "require version X or newer") AC_DEFUN([CTNG_PROG_VERSION_REQ_STRICT], [CTNG_PROG_VERSION([$1], [$2], [$3], [$4], [$5], [$6]) - AS_IF([test -z "$$1" || ! $acx_version_$1_ok], + AS_IF([test -z "$$1" || ! $ctng_version_$1_ok], [AC_MSG_ERROR([Required tool not found: $2])]) ]) |