From: Karel Zak <kzak@redhat.com>
Date: Tue, 21 Feb 2017 10:00:19 +0000 (+0100)
Subject: build-sys: simplify UL_ENABLE_ALIAS() semantic
X-Git-Tag: v2.30-rc1~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc72f51e1f8ea824dc4565c844cc9119919950e9;p=thirdparty%2Futil-linux.git

build-sys: simplify UL_ENABLE_ALIAS() semantic

Let's follow only $enable_ variables. In this case the MASTERNAME
(e.g. [schedutils] for --enable-schedutils) has to be without
UL_BUILD_INIT.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index be282f04c2..8f2c22031b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1905,9 +1905,8 @@ AM_CONDITIONAL([BUILD_SETTERM], [test "x$build_setterm" = xyes])
 # ionice, taskset and chrt
 AC_ARG_ENABLE([schedutils],
   AS_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, taskset]),
-  [], [UL_DEFAULT_ENABLE([schedutils], [yes])]
+  [], [UL_DEFAULT_ENABLE([schedutils], [check])]
 )
-UL_BUILD_INIT([schedutils])
 
 
 UL_ENABLE_ALIAS([ionice], [schedutils])
diff --git a/m4/ul.m4 b/m4/ul.m4
index ed7227c512..db04c12691 100644
--- a/m4/ul.m4
+++ b/m4/ul.m4
@@ -432,7 +432,7 @@ AC_DEFUN([UL_DEFAULT_ENABLE], [
 
 dnl UL_ENABLE_ALIAS(NAME, MASTERNAME)
 dnl
-dnl Initializes $enable_<name> variable according to $build_<mastername>.  This
+dnl Initializes $enable_<name> variable according to $enable_<mastername>. This
 dnl is usefull for example if you want to use one --enable-mastername option
 dnl for group of programs.
 dnl
@@ -440,7 +440,7 @@ AC_DEFUN([UL_ENABLE_ALIAS], [
   m4_define([suffix], $1)
   m4_define([mastersuffix], $2)
 
-  enable_[]suffix=$build_[]mastersuffix
+  enable_[]suffix=$enable_[]mastersuffix
 ])