Skip to content

Makefile.PL: use AutoConf before trying to exec #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Makefile.PL: use AutoConf before trying to exec #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ SSLeay$Config{'obj_ext'} : constants.c $constants_t
MAKE
}

my $ac;

sub ssleay {
my $prefix = find_openssl_prefix();
my $exec = find_openssl_exec($prefix);
Expand All @@ -121,7 +123,7 @@ EOM
CCCDLFLAGS => $opts->{cccdlflags},
OPTIMIZE => $opts->{optimize},
INC => join(' ', map qq{-I"$_"}, @{$opts->{inc_paths}}),
LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
LIBS => $opts->{libs} ? $opts->{libs} : join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
);
# From HMBRAND to handle multple version of OPENSSL installed
if (my $lp = join " " => map '-L'.maybe_quote($_), @{$opts->{lib_paths} || []})
Expand All @@ -140,6 +142,13 @@ sub ssleay_get_build_opts {
lib_links => [],
cccdlflags => '',
};

if($ac) {
$opts->{libs} = $ac->_get_extra_linker_flags;
$opts->{cccdlflags} = $ac->_get_extra_compiler_flags;
return $opts;
}

for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
}
Expand Down Expand Up @@ -245,6 +254,11 @@ sub check_no_path { # On OS/2 it would be typically on default paths
sub find_openssl_prefix {
my ($dir) = @_;

$ac = eval "use Config::AutoConf 0.317; Config::AutoConf->new;";
if($ac) {
$ac->check_prog_pkg_config and $ac->pkg_config_package_flags("openssl") and return "<AC>";
}

if (defined $ENV{OPENSSL_PREFIX}) {
return $ENV{OPENSSL_PREFIX};
}
Expand Down Expand Up @@ -285,6 +299,7 @@ sub find_openssl_prefix {

sub find_openssl_exec {
my ($prefix) = @_;
return $ac->{cache}->{$ac->_cache_name("prog", "PKG_CONFIG")} if $ac;

my $exe_path;
for my $subdir (qw( bin sbin out32dll ia64_exe alpha_exe )) {
Expand All @@ -302,7 +317,13 @@ sub check_openssl_version {
my ($prefix, $exec) = @_;
my ($major, $minor, $letter);

{
if($ac) {
my $vers_str = Config::AutoConf->can("capture")->( sub { system($exec, "openssl", "-modversion") } );
chomp $vers_str;
($major, $minor, $letter) = $vers_str =~ m/(\d+\.\d+)\.(\d+)([a-z]?)/;
}

unless(defined $major) {
my $pipe = gensym();
open($pipe, qq{"$exec" version |})
or die "Could not execute $exec";
Expand Down