mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-19 06:53:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

"no-engine" was being ignored, so remove it from the advertised syntax.

Browse Source 
Also remove some commented-out lines of code that deny CVS its purpose.
This commit is contained in:
Geoff Thorpe 2004-06-03 03:34:53 +00:00
parent 9081980565
commit 263e3151e2
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Configure
View File

@ -10,7 +10,7 @@ use strict;
# see INSTALL for instructions. # see INSTALL for instructions.
my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-engine] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
# Options: # Options:
# #
@ -38,7 +38,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-
# --test-sanity Make a number of sanity checks on the data in this file. # --test-sanity Make a number of sanity checks on the data in this file.
# This is a debugging tool for OpenSSL developers. # This is a debugging tool for OpenSSL developers.
# #
# no-engine do not compile in any engine code.
# no-hw-xxx do not compile support for specific crypto hardware. # no-hw-xxx do not compile support for specific crypto hardware.
# Generic OpenSSL-style methods relating to this support # Generic OpenSSL-style methods relating to this support
# are always compiled but return NULL if the hardware # are always compiled but return NULL if the hardware
@ -704,7 +703,6 @@ PROCESS_ARGS:
elsif (/^no-asm$/) elsif (/^no-asm$/)
{ {
$no_asm=1; $no_asm=1;
#$flags .= "-DOPENSSL_NO_ASM ";
$openssl_other_defines .= "#define OPENSSL_NO_ASM\n"; $openssl_other_defines .= "#define OPENSSL_NO_ASM\n";
} }
elsif (/^no-err$/) elsif (/^no-err$/)
@ -716,12 +714,10 @@ PROCESS_ARGS:
{ {
my $hw=$1; my $hw=$1;
$hw =~ tr/[a-z]/[A-Z]/; $hw =~ tr/[a-z]/[A-Z]/;
#$flags .= "-DOPENSSL_NO_HW_$hw ";
$openssl_other_defines .= "#define OPENSSL_NO_HW_$hw\n"; $openssl_other_defines .= "#define OPENSSL_NO_HW_$hw\n";
} }
elsif (/^no-hw$/) elsif (/^no-hw$/)
{ {
#$flags .= "-DOPENSSL_NO_HW ";
$openssl_other_defines .= "#define OPENSSL_NO_HW\n"; $openssl_other_defines .= "#define OPENSSL_NO_HW\n";
} }
elsif (/^no-dso$/) elsif (/^no-dso$/)
@ -1157,12 +1153,10 @@ if (!$no_shared)
if ($no_shared) if ($no_shared)
{ {
#$cflags="-DOPENSSL_NO_DYNAMIC_ENGINE $cflags";
$openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n"; $openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
} }
else else
{ {
#$cflags="-DOPENSSL_NO_STATIC_ENGINE $cflags";
$openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n"; $openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
} }