[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff (commit)
      from  a583fc45fa91a74b944526448621161640579bc2 (commit)


- Log -----------------------------------------------------------------
commit 432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 16 16:49:29 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index c2df734..0cf893e 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}));