From b248c9d416624fe0748bd2caf94f66bb7d0d4a30 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 27 May 2014 14:58:14 +0200
Subject: build-sys: fix UL_BUILD_INIT()

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 m4/ul.m4 | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'm4')

diff --git a/m4/ul.m4 b/m4/ul.m4
index 1e0fedbe7..093213133 100644
--- a/m4/ul.m4
+++ b/m4/ul.m4
@@ -336,21 +336,24 @@ dnl
 AC_DEFUN([UL_BUILD_INIT], [
   m4_define([suffix], m4_default([$3],$1))
   m4_ifblank([$2],
-[build_[]suffix=$enable_[]suffix],
-[
-if test "x$ul_default_estate" != x; then
+[if test "x$enable_[]suffix" = xno; then
+   build_[]suffix=no
+else
+   build_[]suffix=yes
+fi],
+[if test "x$ul_default_estate" != x; then
   enable_[]suffix=$ul_default_estate
 else[]
   ifelse(
       [$2], [check],[
-  build_[]suffix='yes'
-  enable_[]suffix='check'],
+  build_[]suffix=yes
+  enable_[]suffix=check],
       [$2], [yes],[
-  build_[]suffix='yes'
-  enable_[]suffix='yes'],
+  build_[]suffix=yes
+  enable_[]suffix=yes],
       [$2], [no], [
-  build_[]suffix='no'
-  enable_[]suffix='no'])
+  build_[]suffix=no
+  enable_[]suffix=no])
 fi])
 ])
 
-- 
cgit v1.2.3-55-g7522