Use ${:openssldir} option in more openssl configure-options

Author: Arnon Yaari

buildout-build-redhat-ppc64.cfg

@@ -3,7 +3,7 @@ extends = buildout-build-redhat-64bit.cfg
 
 [openssl]
 configure-command = ./Configure
-configure-options = linux-ppc64 --prefix=${:prefix} --shared --libdir=lib64 --openssldir=/etc/pki/tls/
+configure-options = linux-ppc64 --prefix=${:prefix} --shared --libdir=lib64 --openssldir=${:openssldir}
 
 [cyrus-sasl]
 configure-options = --prefix=${options:prefix} --without-saslauthd --without-authdaemond --disable-java --disable-dependency-tracking --disable-rpath --disable-java --without-gdbm --without-dblib --disable-macos-framework --enable-static --libdir=${options:prefix}/lib64 --build=ppc

buildout-build-redhat-ppc64le.cfg

@@ -9,7 +9,7 @@ configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --libdir=${opti
 
 [openssl]
 configure-command = ./Configure
-configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64 --openssldir=/etc/pki/tls/
+configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64 --openssldir=${:openssldir}
 patches =
 
 [openssh]

buildout-build-suse-ppc64.cfg

@@ -2,8 +2,7 @@
 extends = buildout-build-redhat-ppc64.cfg
 
 [openssl]
-# we extend from redhat-ppc64 where --openssldir is set - we don't need that here
-configure-options = linux-ppc64 --prefix=${:prefix} --shared --libdir=lib64
+openssldir = /etc/ssl/
 
 [libgcrypt]
 configure-options = ${options:configure-options} --with-gpg-error-prefix=${:prefix} --enable-static --libdir=${options:prefix}/lib64

buildout-build-suse-ppc64le.cfg

@@ -1,6 +1,2 @@
 [buildout]
-extends = buildout-build-suse-ppc64.cfg buildout-build-redhat-ppc64le.cfg
-
-[openssl]
-# we extend from redhat-ppc64le where --openssldir is set - we don't need that here
-configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64
+extends = buildout-build-redhat-ppc64le.cfg buildout-build-suse-ppc64.cfg