I forgot about $openssl_other_defines ... should probably do this

for consistency. Not sure though whether HAVE_DLFCN_H should be
included too? If we go the autoconf route then this probably wouldn't
be included.
This commit is contained in:
Geoff Thorpe 2000-04-06 11:56:45 +00:00
parent bc2aadad84
commit eca57e925a

View File

@ -554,21 +554,27 @@ $cflags="$flags$cflags" if ($flags ne "");
# has support compiled in for them. Currently each method is enabled # has support compiled in for them. Currently each method is enabled
# by a define "DSO_<name>" ... we translate the "dso_scheme" config # by a define "DSO_<name>" ... we translate the "dso_scheme" config
# string entry into using the following logic; # string entry into using the following logic;
my $dso_cflags;
if (!$no_dso && $dso_scheme ne "") if (!$no_dso && $dso_scheme ne "")
{ {
$dso_scheme =~ tr/[a-z]/[A-Z]/; $dso_scheme =~ tr/[a-z]/[A-Z]/;
if ($dso_scheme eq "DLFCN") if ($dso_scheme eq "DLFCN")
{ {
$cflags = "-DDSO_DLFCN -DHAVE_DLFCN_H $cflags"; $dso_cflags = "-DDSO_DLFCN -DHAVE_DLFCN_H";
$openssl_other_defines .= "#define DSO_DLFCN\n";
$openssl_other_defines .= "#define HAVE_DLFCN_H\n";
} }
elsif ($dso_scheme eq "DLFCN_NO_H") elsif ($dso_scheme eq "DLFCN_NO_H")
{ {
$cflags = "-DDSO_DLFCN $cflags"; $dso_cflags = "-DDSO_DLFCN";
$openssl_other_defines .= "#define DSO_DLFCN\n";
} }
else else
{ {
$cflags = "-DDSO_$dso_scheme $cflags"; $dso_cflags = "-DDSO_$dso_scheme";
$openssl_other_defines .= "#define DSO_$dso_scheme\n";
} }
$cflags = "$dso_cflags $cflags";
} }
my $thread_cflags; my $thread_cflags;