openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor config - a small cosmetic touchup of Configure 

Start simple, removed some unused variables and change all '<<EOF' to
'<<"EOF"'.  The latter is because some code colorizers (notably, in
emacs) cannot recognise the here document end marker unless it's
quoted and therefore assume the rest of the file is part of the here
document.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2015-05-18 02:46:21 +02:00
parent 24dfa621c8
commit 76ffb43d1a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Configure
View File

@ -127,11 +127,6 @@ my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
# MD2_CHAR slags pentium pros
my $x86_gcc_opts="RC4_INDEX MD2_INT";
#$bits1="SIXTEEN_BIT ";
#$bits2="THIRTY_TWO_BIT ";
my $bits1="THIRTY_TWO_BIT ";
my $bits2="SIXTY_FOUR_BIT ";
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
# which would cover all BSD flavors. -pthread applies to them all,
# but is treated differently. OpenBSD expands is as -D_POSIX_THREAD
@ -2283,7 +2278,7 @@ find(sub {
}
if($IsMK1MF) {
open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
printf OUT <<EOF;
printf OUT <<"EOF";
#ifndef MK1MF_BUILD
/* auto-generated by Configure for crypto/cversion.c:
* for Unix builds, crypto/Makefile.ssl generates functional definitions;
@ -2314,7 +2309,7 @@ if ($IsMK1MF && ($target !~ /^netware/)) {
$v4=hex $4;
}
open (OUT,">ms/version32.rc") || die "Can't open ms/version32.rc";
print OUT <<EOF;
print OUT <<"EOF";
#include <winver.h>
LANGUAGE 0x09,0x01
@ -2366,19 +2361,19 @@ EOF
close(OUT);
}
print <<EOF;
print <<"EOF";
Configured for $target.
EOF
print <<\EOF if (!$no_threads && !$threads);
print <<"EOF" if (!$no_threads && !$threads);
The library could not be configured for supporting multi-threaded
applications as the compiler options required on this system are not known.
See file INSTALL for details if you need multi-threading.
EOF
print <<\EOF if ($no_shared_warn);
print <<"EOF" if ($no_shared_warn);
You gave the option 'shared', which is not supported on this platform, so
we will pretend you gave the option 'no-shared'. If you know how to implement
@ -2386,7 +2381,7 @@ shared libraries, please let us know (but please first make sure you have
tried with a current version of OpenSSL).
EOF
print <<EOF if ($warn_make_depend);
print <<"EOF" if ($warn_make_depend);
*** Because of configuration changes, you MUST do the following before
*** building:
@ -2471,7 +2466,7 @@ sub print_table_entry
return if $table{$target}->{template};
if ($type eq "TABLE") {
print <<EOF
print <<"EOF"
*** $target
\$cc = $table{$target}->{cc}