|
 |
578744b |
diff -up openssl-0.9.8m/Configure.enginesdir openssl-0.9.8m/Configure
|
|
|
578744b |
--- openssl-0.9.8m/Configure.enginesdir 2010-03-22 17:36:34.000000000 +0100
|
|
|
578744b |
+++ openssl-0.9.8m/Configure 2010-03-22 17:39:03.000000000 +0100
|
|
|
578744b |
@@ -590,6 +590,7 @@ my $idx_arflags = $idx++;
|
|
|
e96bebc |
my $prefix="";
|
|
|
578744b |
my $libdir="";
|
|
|
e96bebc |
my $openssldir="";
|
|
|
e96bebc |
+my $enginesdir="";
|
|
|
e96bebc |
my $exe_ext="";
|
|
|
578744b |
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
|
|
|
578744b |
my $cross_compile_prefix="";
|
|
|
578744b |
@@ -837,6 +838,10 @@ PROCESS_ARGS:
|
|
|
e96bebc |
{
|
|
|
e96bebc |
$openssldir=$1;
|
|
|
e96bebc |
}
|
|
|
e96bebc |
+ elsif (/^--enginesdir=(.*)$/)
|
|
|
e96bebc |
+ {
|
|
|
e96bebc |
+ $enginesdir=$1;
|
|
|
e96bebc |
+ }
|
|
|
e96bebc |
elsif (/^--install.prefix=(.*)$/)
|
|
|
e96bebc |
{
|
|
|
e96bebc |
$install_prefix=$1;
|
|
|
578744b |
@@ -1111,7 +1116,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
|
|
e96bebc |
|
|
|
e96bebc |
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
|
|
e96bebc |
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
|
|
e96bebc |
-
|
|
|
e96bebc |
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
|
|
e96bebc |
|
|
|
e96bebc |
print "IsMK1MF=$IsMK1MF\n";
|
|
|
e96bebc |
|
|
|
578744b |
@@ -1692,14 +1697,7 @@ while (<IN>)
|
|
|
578744b |
print OUT "#define OPENSSLDIR \"$foo\"\n";
|
|
|
578744b |
}
|
|
|
e96bebc |
elsif (/^#define\s+ENGINESDIR/)
|
|
|
578744b |
- {
|
|
|
578744b |
- # $foo is to become "$prefix/lib$multilib/engines";
|
|
|
578744b |
- # as Makefile.org and engines/Makefile are adapted for
|
|
|
578744b |
- # $multilib suffix.
|
|
|
578744b |
- my $foo = "$prefix/lib/engines";
|
|
|
578744b |
- $foo =~ s/\\/\\\\/g;
|
|
|
578744b |
- print OUT "#define ENGINESDIR \"$foo\"\n";
|
|
|
578744b |
- }
|
|
|
e96bebc |
+ { print OUT "#define ENGINESDIR \"$enginesdir\"\n"; }
|
|
|
e96bebc |
elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
|
|
|
e96bebc |
{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
|
|
|
e96bebc |
if $export_var_as_fn;
|