From fd3b0d8235322ada8f3b9b83b30ce57242ebf6cd Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Fri, 29 May 2015 19:23:00 +0300 Subject: BUILD: Fix variable substitution in cwrap.m4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add another dollar sign to have variable name substituted by m4 in "cwrap.m4" further substituted with its value by shell in "configure". Before, this: [ test x$2 = xyes] would produce this in "configure" for uid_wrapper test: test xHAVE_UID_WRAPPER = xyes which is always false. Now the changed code: [ test x$$2 = xyes] Would produce this in "configure" instead: test x$HAVE_UID_WRAPPER = xyes which will properly process the test result. This fixes uid_wrapper and nss_wrapper detection, which were considered missing otherwise, resulting in cwrap tests not running. Reviewed-by: Lukáš Slebodník --- src/external/cwrap.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/external/cwrap.m4 b/src/external/cwrap.m4 index b03d1ef00..b8489cc76 100644 --- a/src/external/cwrap.m4 +++ b/src/external/cwrap.m4 @@ -16,7 +16,7 @@ AC_DEFUN([AM_CHECK_WRAPPER], AC_MSG_WARN([cwrap library $1 not found, some tests will not run]) ]) - AM_CONDITIONAL($2, [ test x$2 = xyes]) + AM_CONDITIONAL($2, [ test x$$2 = xyes]) ]) AC_DEFUN([AM_CHECK_UID_WRAPPER], -- cgit