From: Richard Levitte <levitte@openssl.org>
Date: Tue, 16 Feb 2016 15:49:29 +0000 (+0100)
Subject: Check for OPENSSL_USE_APPLINK in $config{cflags} as well
X-Git-Tag: OpenSSL_1_1_0-pre4~651
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff;p=oweals%2Fopenssl.git

Check for OPENSSL_USE_APPLINK in $config{cflags} as well

Macro definitions "should" be found in $config{defines}, but some
configs haven't transfered macro definitions from their 'cflags'
settings (which isn't mandatory anyway), so check both places.

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/Configure b/Configure
index c2df73417a..0cf893ee7a 100755
--- a/Configure
+++ b/Configure
@@ -1045,7 +1045,9 @@ if ($target{ranlib} eq "")
 
 if (!$no_asm) {
     $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
-    $target{cpuid_asm_src}.=" uplink.c uplink-x86.s" if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}});
+    $target{cpuid_asm_src}.=" uplink.c uplink-x86.s"
+        if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}}
+            || grep /(^|\s)-DOPENSSL_USE_APPLINK(\s|$)/, ${$config{cflags}});
 
     $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));