41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
diff -up openssl-0.9.8j/Configure.enginesdir openssl-0.9.8j/Configure
|
||
|
|
--- openssl-0.9.8j/Configure.enginesdir 2009-01-13 23:17:40.000000000 +0100
|
||
|
|
+++ openssl-0.9.8j/Configure 2009-01-13 23:17:40.000000000 +0100
|
||
|
|
@@ -577,6 +577,7 @@ my $idx_arflags = $idx++;
|
||
|
|
|
||
|
|
my $prefix="";
|
||
|
|
my $openssldir="";
|
||
|
|
+my $enginesdir="";
|
||
|
|
my $exe_ext="";
|
||
|
|
my $install_prefix="";
|
||
|
|
my $fipslibdir="/usr/local/ssl/fips-1.0/lib/";
|
||
|
|
@@ -815,6 +816,10 @@ PROCESS_ARGS:
|
||
|
|
{
|
||
|
|
$openssldir=$1;
|
||
|
|
}
|
||
|
|
+ elsif (/^--enginesdir=(.*)$/)
|
||
|
|
+ {
|
||
|
|
+ $enginesdir=$1;
|
||
|
|
+ }
|
||
|
|
elsif (/^--install.prefix=(.*)$/)
|
||
|
|
{
|
||
|
|
$install_prefix=$1;
|
||
|
|
@@ -1080,7 +1085,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
||
|
|
|
||
|
|
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
||
|
|
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
||
|
|
-
|
||
|
|
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
||
|
|
|
||
|
|
print "IsMK1MF=$IsMK1MF\n";
|
||
|
|
|
||
|
|
@@ -1635,7 +1640,7 @@ while (<IN>)
|
||
|
|
if (/^#define\s+OPENSSLDIR/)
|
||
|
|
{ print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
|
||
|
|
elsif (/^#define\s+ENGINESDIR/)
|
||
|
|
- { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
|
||
|
|
+ { print OUT "#define ENGINESDIR \"$enginesdir\"\n"; }
|
||
|
|
elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
|
||
|
|
{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
|
||
|
|
if $export_var_as_fn;
|