|
1 --- openssl-0.9.8n/Configure 2010-04-19 17:45:39.421625300 -0700 |
|
2 +++ openssl-0.9.8n/Configure.new 2010-06-18 15:18:52.437417100 -0700 |
|
3 @@ -20,6 +20,8 @@ |
|
4 # --prefix option is given; /usr/local/ssl otherwise) |
|
5 # --prefix prefix for the OpenSSL include, lib and bin directories |
|
6 # (Default: the OPENSSLDIR directory) |
|
7 +# --enginesdir engines shared library location |
|
8 +# (Default: $prefix/lib/engines) |
|
9 # |
|
10 # --pk11-libname PKCS#11 library name. |
|
11 # (Default: none) |
|
12 @@ -607,6 +609,7 @@ |
|
13 my $prefix=""; |
|
14 my $libdir=""; |
|
15 my $openssldir=""; |
|
16 +my $enginesdir=""; |
|
17 my $exe_ext=""; |
|
18 my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; |
|
19 my $cross_compile_prefix=""; |
|
20 @@ -858,6 +861,10 @@ |
|
21 { |
|
22 $openssldir=$1; |
|
23 } |
|
24 + elsif (/^--enginesdir=(.*)$/) |
|
25 + { |
|
26 + $enginesdir=$1; |
|
27 + } |
|
28 elsif (/^--install.prefix=(.*)$/) |
|
29 { |
|
30 $install_prefix=$1; |
|
31 @@ -1125,8 +1132,16 @@ |
|
32 } |
|
33 $prefix=$openssldir if $prefix eq ""; |
|
34 |
|
35 +if ($enginesdir eq "") |
|
36 + { |
|
37 + $enginesdir = "$prefix/lib/engines"; |
|
38 + } |
|
39 + |
|
40 $libdir="lib" if $libdir eq ""; |
|
41 |
|
42 + |
|
43 + |
|
44 + |
|
45 $default_ranlib= &which("ranlib") or $default_ranlib="true"; |
|
46 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") |
|
47 or $perl="perl"; |
|
48 @@ -1724,10 +1739,7 @@ |
|
49 } |
|
50 elsif (/^#define\s+ENGINESDIR/) |
|
51 { |
|
52 - # $foo is to become "$prefix/lib$multilib/engines"; |
|
53 - # as Makefile.org and engines/Makefile are adapted for |
|
54 - # $multilib suffix. |
|
55 - my $foo = "$prefix/lib/engines"; |
|
56 + my $foo = $enginesdir; |
|
57 $foo =~ s/\\/\\\\/g; |
|
58 print OUT "#define ENGINESDIR \"$foo\"\n"; |
|
59 } |