generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make Configure add the configuration options that it was copmiled

Browse Source 
with.

Currently, those defines are protected with a OPENSSL_EXCLUDED.  That
may not be the best strategy, but it will do for now.
This commit is contained in:
Richard Levitte 2000-02-18 09:11:37 +00:00
parent 4328d51d08
commit fb044c592d
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Configure
View File

@ -410,6 +410,7 @@ $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
my $flags=""; my $flags="";
my $depflags=""; my $depflags="";
my $defines="";
my $libs=""; my $libs="";
my $target=""; my $target="";
my $options=""; my $options="";
@ -419,6 +420,7 @@ foreach (@ARGV)
{ {
$no_asm=1; $no_asm=1;
$flags .= "-DNO_ASM "; $flags .= "-DNO_ASM ";
$defines .= "#define NO_ASM\n";
} }
elsif (/^no-threads$/) elsif (/^no-threads$/)
{ $no_threads=1; } { $no_threads=1; }
@ -431,12 +433,14 @@ foreach (@ARGV)
$algo =~ tr/[a-z]/[A-Z]/; $algo =~ tr/[a-z]/[A-Z]/;
$flags .= "-DNO_$algo "; $flags .= "-DNO_$algo ";
$depflags .= "-DNO_$algo "; $depflags .= "-DNO_$algo ";
$defines .= "#define NO_$algo\n";
if ($algo eq "DES") if ($algo eq "DES")
{ {
push @skip, "mdc2"; push @skip, "mdc2";
$options .= " no-mdc2"; $options .= " no-mdc2";
$flags .= "-DNO_MDC2 "; $flags .= "-DNO_MDC2 ";
$depflags .= "-DNO_MDC2 "; $depflags .= "-DNO_MDC2 ";
$defines .= "#define NO_MDC2\n";
} }
} }
elsif (/^386$/) elsif (/^386$/)
@ -445,6 +449,7 @@ foreach (@ARGV)
{ {
$libs.= "-lRSAglue -lrsaref "; $libs.= "-lRSAglue -lrsaref ";
$flags.= "-DRSAref "; $flags.= "-DRSAref ";
$defines .= "#define RSAref\n";
} }
elsif (/^[-+]/) elsif (/^[-+]/)
{ {
@ -522,6 +527,7 @@ print "IsWindows=$IsWindows\n";
$cflags="$flags$cflags" if ($flags ne ""); $cflags="$flags$cflags" if ($flags ne "");
my $thread_cflags; my $thread_cflags;
my $thread_defines;
if ($thread_cflag ne "(unknown)" && !$no_threads) if ($thread_cflag ne "(unknown)" && !$no_threads)
{ {
# If we know how to do it, support threads by default. # If we know how to do it, support threads by default.
@ -535,7 +541,14 @@ if ($thread_cflag eq "(unknown)")
} }
else else
{ {
$thread_cflags="-DTHREADS $thread_cflag $cflags" $thread_cflags="-DTHREADS $thread_cflag $cflags";
foreach my $def (split ' ',$thread_cflag)
{
if ($def =~ s/^-D//)
{
$thread_defines .= "#define $def\n";
}
}
} }
$lflags="$libs$lflags"if ($libs ne ""); $lflags="$libs$lflags"if ($libs ne "");
@ -549,6 +562,7 @@ if ($no_asm)
if ($threads) if ($threads)
{ {
$cflags=$thread_cflags; $cflags=$thread_cflags;
$defines .= $thread_defines;
} }
#my ($bn1)=split(/\s+/,$bn_obj); #my ($bn1)=split(/\s+/,$bn_obj);
@ -704,7 +718,13 @@ foreach (sort split(/\s+/,$bn_ops))
open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n"; open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";
open(OUT,'>crypto/opensslconf.h') || die "unable to create crypto/opensslconf.h:$!\n"; open(OUT,'>crypto/opensslconf.h') || die "unable to create crypto/opensslconf.h:$!\n";
print OUT "/* Generated automatically from opensslconf.h.in by Configure. */\n\n"; print OUT "/* opensslconf.h */"
print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
if ($defines ne "")
{
print OUT "/* OpenSSL was configured with the following options: */\n";
print OUT "#ifdef OPENSSL_EXCLUDED\n$defines#endif\n\n";
}
while (<IN>) while (<IN>)
{ {
if (/^#define\s+OPENSSLDIR/) if (/^#define\s+OPENSSLDIR/)