Work correctly with a development version of OpenSSL. I suspect

something similar is needed when there are two OpenSSL installations,
one in a default location.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1358167 13f79535-47bb-0310-9956-ffa450edef68

acinclude.m4

@@ -499,6 +499,18 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
     saved_LDFLAGS="$LDFLAGS"
     SSL_LIBS=""
 
+    dnl See if we've been given a development OpenSSL (lib does not exist)
+    if test ! -d "$ap_openssl_base/lib"; then
+      AC_MSG_WARN([Using development version of OpenSSL])
+      dnl we need to prepend the directories to override the system version
+      CPPFLAGS="-I$ap_openssl_base/include $CPPFLAGS"
+      INCLUDES="-I$ap_openssl_base/include $INCLUDES"
+      LDFLAGS="-L$ap_openssl_base $LDFLAGS"
+      dnl naughty, but easier than the alternatives
+      saved_LDFLAGS="$LDFLAGS"
+      SSL_LIBS="-L$ap_openssl_base"
+    else
+
       dnl Before doing anything else, load in pkg-config variables
       if test -n "$PKGCONFIG"; then
         saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
@@ -533,6 +545,7 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
           APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib])
         fi
       fi
+    fi
 
     AC_MSG_CHECKING([for OpenSSL version >= 0.9.7])
     AC_TRY_COMPILE([#include <openssl/opensslv.h>],[

modules/ssl/ssl_engine_init.c

@@ -1057,6 +1057,7 @@ static int ssl_server_import_cert(server_rec *s,
 		     "Unable to initialize TLS authz extension: "
 		     "OpenSSL version too low");
 	ssl_die(s);
+#error xx
 #endif
     }