1 #

     2 # This was developed in house to configure the engine dir.

     3 # Not suitable for upstream.

     4 #

     5 --- /tmp/18/Configure	Fri Feb 11 15:15:50 2011

     6 +++ openssl-1.0.0d/Configure	Fri Feb 11 15:18:09 2011

     7 @@ -18,6 +18,8 @@

     8  #               --prefix option is given; /usr/local/ssl otherwise)

     9  # --prefix      prefix for the OpenSSL include, lib and bin directories

    10  #               (Default: the OPENSSLDIR directory)

    11 +# --enginesdir  engines shared library location

    12 +#               (Default: $prefix/lib/engines)

    13  #

    14  # --pk11-libname  PKCS#11 library name.

    15  #               (Default: none)

    16 @@ -679,6 +679,7 @@

    17  my $prefix="";

    18  my $libdir="";

    19  my $openssldir="";

    20 +my $enginesdir="";

    21  my $exe_ext="";

    22  my $install_prefix= "$ENV{'INSTALL_PREFIX'}";

    23  my $cross_compile_prefix="";

    24 @@ -917,6 +920,10 @@

    25  				{

    26  				$openssldir=$1;

    27  				}

    28 +			elsif (/^--enginesdir=(.*)$/)

    29 +				{

    30 +				$enginesdir=$1;

    31 +				}

    32  			elsif (/^--install.prefix=(.*)$/)

    33  				{

    34  				$install_prefix=$1;

    35 @@ -1224,6 +1231,10 @@

    36  # we're ready to tolerate, so don't...

    37  $multilib="" if !-d "$prefix/lib$multilib";

    38  

    39 +if ($enginesdir eq "") {

    40 +	$enginesdir = "$prefix/lib/engines";

    41 +}

    42 +

    43  $libdir="lib$multilib" if $libdir eq "";

    44  

    45  $cflags = "$cflags$exp_cflags";

    46 @@ -1846,7 +1857,7 @@

    47  		}

    48  	elsif	(/^#define\s+ENGINESDIR/)

    49  		{

    50 -		my $foo = "$prefix/$libdir/engines";

    51 +		my $foo = "$enginesdir";

    52  		$foo =~ s/\\/\\\\/g;

    53  		print OUT "#define ENGINESDIR \"$foo\"\n";

    54  		}