components/openssl/openssl-1.0.1/patches/28-enginesdir.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Fri, 03 May 2013 16:10:11 -0700
branchs11-update
changeset 2593 b92e6df5eaf0
parent 363 components/openssl/openssl-1.0.0/patches/28-enginesdir.patch@9c0cad004039
child 4002 95b8f35fcdd5
permissions -rw-r--r--
PSARC 2013/034 OpenSSL 1.0.1 15824597 SUNBT7206149 Resynch with the latest OpenSSL (1.0.1e)

--- /tmp/18/Configure	Fri Feb 11 15:15:50 2011
+++ openssl-1.0.0d/Configure	Fri Feb 11 15:18:09 2011
@@ -18,6 +18,8 @@
 #               --prefix option is given; /usr/local/ssl otherwise)
 # --prefix      prefix for the OpenSSL include, lib and bin directories
 #               (Default: the OPENSSLDIR directory)
+# --enginesdir  engines shared library location
+#               (Default: $prefix/lib/engines)
 #
 # --pk11-libname  PKCS#11 library name.
 #               (Default: none)
@@ -679,6 +679,7 @@
 my $prefix="";
 my $libdir="";
 my $openssldir="";
+my $enginesdir="";
 my $exe_ext="";
 my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
 my $cross_compile_prefix="";
@@ -911,6 +911,10 @@
 				{
 				$openssldir=$1;
 				}
+			elsif (/^--enginesdir=(.*)$/)
+				{
+				$enginesdir=$1;
+				}
 			elsif (/^--install.prefix=(.*)$/)
 				{
 				$install_prefix=$1;
@@ -1218,6 +1225,10 @@
 # we're ready to tolerate, so don't...
 $multilib="" if !-d "$prefix/lib$multilib";
 
+if ($enginesdir eq "") {
+	$enginesdir = "$prefix/lib/engines";
+}
+
 $libdir="lib$multilib" if $libdir eq "";
 
 $cflags = "$cflags$exp_cflags";
@@ -1837,7 +1848,7 @@
 		}
 	elsif	(/^#define\s+ENGINESDIR/)
 		{
-		my $foo = "$prefix/$libdir/engines";
+		my $foo = "$enginesdir";
 		$foo =~ s/\\/\\\\/g;
 		print OUT "#define ENGINESDIR \"$foo\"\n";
 		}