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

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

     3 @@ -18,6 +18,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 @@ -672,6 +672,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 @@ -904,6 +904,10 @@

    21  				{

    22  				$openssldir=$1;

    23  				}

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

    25 +				{

    26 +				$enginesdir=$1;

    27 +				}

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

    29  				{

    30  				$install_prefix=$1;

    31 @@ -1211,6 +1218,10 @@

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

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

    34  

    35 +if ($enginesdir eq "") {

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

    37 +}

    38 +

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

    40  

    41  $cflags = "$cflags$exp_cflags";

    42 @@ -1830,7 +1841,7 @@

    43  		}

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

    45  		{

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

    47 +		my $foo = "$enginesdir";

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

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

    50  		}