Have to build OpenSSL shared libraries even though we don't need them,

because we do need position independent code to build _POW.so.

svn path=/configure; revision=3603

1 files changed, 7 insertions, 9 deletions

diff --git a/openssl/Makefile.in b/openssl/Makefile.in
index 659c88c8..9c0a0f06 100644
--- a/openssl/Makefile.in
+++ b/openssl/Makefile.in
@@ -4,7 +4,7 @@ VERSION = 1.0.0b
 
 OPENSSL_CONFIG_COMMAND   = @OPENSSL_CONFIG_COMMAND@
 OPENSSL_BUILD_DIRECTORY  = @abs_builddir@/openssl
-OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@ 
+OPENSSL_SHARED_LIBRARY_DIR = @OPENSSL_SHARED_LIBRARY_DIR@
 
 # Kludge alert:
 #
@@ -13,15 +13,13 @@ OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@
 # run out of the build tree.  This is temporary.  Once we write "make
 # install" code, we'll have to change that to point to the directory
 # where the OpenSSL shared libraries will be installed.
-#
-# I would have avoided shared libraries entirely if I could, but the
-# GNU linker isn't able to build POW (see ../pow/) from static
-# libraries on 64-bit hardware.
-#
-# "You are lost in a maze of twisty programs, all broken in different
-# ways" 
 
-OPTIONS = enable-rfc3779 enable-cms no-dso ${OPENSSL_SHARED_LIBRARIES} --prefix=${OPENSSL_BUILD_DIRECTORY}
+# We need to build with enable-shared whether we're really trying to
+# build shared OpenSSL libraries or not, because _POW.so requires
+# position independent code, so we need OpenSSL compiled with the
+# options it would use for a shared library.
+
+OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${OPENSSL_BUILD_DIRECTORY}
 
 all: openssl-${VERSION}/Makefile
 	cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY}