|
1 # |
|
2 # This was developed in house to configure the engine dir. |
|
3 # Not suitable for upstream. |
|
4 # |
1 --- /tmp/18/Configure Fri Feb 11 15:15:50 2011 |
5 --- /tmp/18/Configure Fri Feb 11 15:15:50 2011 |
2 +++ openssl-1.0.0d/Configure Fri Feb 11 15:18:09 2011 |
6 +++ openssl-1.0.0d/Configure Fri Feb 11 15:18:09 2011 |
3 @@ -18,6 +18,8 @@ |
7 @@ -18,6 +18,8 @@ |
4 # --prefix option is given; /usr/local/ssl otherwise) |
8 # --prefix option is given; /usr/local/ssl otherwise) |
5 # --prefix prefix for the OpenSSL include, lib and bin directories |
9 # --prefix prefix for the OpenSSL include, lib and bin directories |
15 my $openssldir=""; |
19 my $openssldir=""; |
16 +my $enginesdir=""; |
20 +my $enginesdir=""; |
17 my $exe_ext=""; |
21 my $exe_ext=""; |
18 my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; |
22 my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; |
19 my $cross_compile_prefix=""; |
23 my $cross_compile_prefix=""; |
20 @@ -911,6 +911,10 @@ |
24 @@ -917,6 +920,10 @@ |
21 { |
25 { |
22 $openssldir=$1; |
26 $openssldir=$1; |
23 } |
27 } |
24 + elsif (/^--enginesdir=(.*)$/) |
28 + elsif (/^--enginesdir=(.*)$/) |
25 + { |
29 + { |
26 + $enginesdir=$1; |
30 + $enginesdir=$1; |
27 + } |
31 + } |
28 elsif (/^--install.prefix=(.*)$/) |
32 elsif (/^--install.prefix=(.*)$/) |
29 { |
33 { |
30 $install_prefix=$1; |
34 $install_prefix=$1; |
31 @@ -1218,6 +1225,10 @@ |
35 @@ -1224,6 +1231,10 @@ |
32 # we're ready to tolerate, so don't... |
36 # we're ready to tolerate, so don't... |
33 $multilib="" if !-d "$prefix/lib$multilib"; |
37 $multilib="" if !-d "$prefix/lib$multilib"; |
34 |
38 |
35 +if ($enginesdir eq "") { |
39 +if ($enginesdir eq "") { |
36 + $enginesdir = "$prefix/lib/engines"; |
40 + $enginesdir = "$prefix/lib/engines"; |
37 +} |
41 +} |
38 + |
42 + |
39 $libdir="lib$multilib" if $libdir eq ""; |
43 $libdir="lib$multilib" if $libdir eq ""; |
40 |
44 |
41 $cflags = "$cflags$exp_cflags"; |
45 $cflags = "$cflags$exp_cflags"; |
42 @@ -1837,7 +1848,7 @@ |
46 @@ -1846,7 +1857,7 @@ |
43 } |
47 } |
44 elsif (/^#define\s+ENGINESDIR/) |
48 elsif (/^#define\s+ENGINESDIR/) |
45 { |
49 { |
46 - my $foo = "$prefix/$libdir/engines"; |
50 - my $foo = "$prefix/$libdir/engines"; |
47 + my $foo = "$enginesdir"; |
51 + my $foo = "$enginesdir"; |