From: Richard Levitte <levitte@openssl.org>
Date: Mon, 22 Feb 2016 18:17:55 +0000 (+0100)
Subject: Use $disabled{shared} in a safer manner
X-Git-Tag: OpenSSL_1_1_0-pre4~542
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de75fb4fb0a0f724c259a5477603c7d0dfd2235;p=thirdparty%2Fopenssl.git

Use $disabled{shared} in a safer manner

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Makefile.in b/Makefile.in
index 9513003506e..924dfa0aa0c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,7 +193,7 @@ TOP=    .
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
-SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' unless $disabled{shared} -}
+SHARED_LIBS={- $disabled{shared} ? '' : '$(SHARED_CRYPTO) $(SHARED_SSL)'  -}
 SHARED_CFLAG={- $target{shared_cflag} -}
 SHARED_LDFLAG={- $target{shared_ldflag}
                  # Unlike other OSes (like Solaris, Linux, Tru64,