You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2018/04/09 07:30:53 UTC

svn commit: r1828671 - /httpd/test/mod_h2/trunk/configure.ac

Author: icing
Date: Mon Apr  9 07:30:52 2018
New Revision: 1828671

URL: http://svn.apache.org/viewvc?rev=1828671&view=rev
Log:
 * allow configure to spec for a specific local openssl version

Modified:
    httpd/test/mod_h2/trunk/configure.ac

Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1828671&r1=1828670&r2=1828671&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Mon Apr  9 07:30:52 2018
@@ -58,6 +58,9 @@ AC_ARG_WITH([nghttp2-version], [AS_HELP_
     [Use nghttp2 of specified version [default=<ignore>]])],
     [NGHTTP2_VERSION_EXACT=$withval], [NGHTTP2_VERSION_EXACT=])
 
+AC_ARG_WITH([local-openssl], [AS_HELP_STRING([--with-local-openssl],
+    [Use a locally built OpenSSL library [default=<ignore>]])],
+    [LOCAL_OPENSSL=$withval], [LOCAL_OPENSSL=])
 
 export BUILD_SUBDIRS="clients mh2fuzz"
 
@@ -272,46 +275,46 @@ fi
 ################################################################################
 
 #OPENSSL_VERSION=1.0.2l
-OPENSSL_VERSION=1.1.1-pre3
+OPENSSL_VERSION=1.1.1-pre4
 LIBEVENT_VERSION=2.0.22-stable
 LIBEV_VERSION=4.24
 ZLIB_VERSION=1.2.11
 
-if test "x$ac_cv_nghttp2" != "xyes"; then
-
-    AC_PATH_PROG([OPENSSL], [openssl])
-    if test "x${OPENSSL}" = "x"; then
-        OPENSSL_VERSION_PRESENT="na"
-    else 
-        OPENSSL_VERSION_PRESENT=$( ${OPENSSL} version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]* .*//g')
-    fi
-
-    case "$OPENSSL_VERSION_PRESENT" in
-        1.0.2*|1.1.*)
-            # acceptable
-            CURL_CONF="$CURL_CONF "'--with-nghttp2=$(prefix)'
-            ;;
-        *)
-            NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
-            INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL openssl($OPENSSL_VERSION)"
-            CURL_CONF="$CURL_CONF "'--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
-            if test "$OS" = "Darwin"; then
-                OPENSSL_CONF_CMD="./Configure"
-                OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc enable-egd"
-            else 
-                OPENSSL_CONF_CMD="./config"
-                OPENSSL_CONF="shared -fPIC enable-egd"
-                NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.libevent-installed"
-                INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libevent($LIBEVENT_VERSION)"
-            fi
-            ;;
-    esac
-
-    if test "$OS" = "Darwin"; then
-        NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
-        INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libev($LIBEV_VERSION) zlib($ZLIB_VERSION)"
-    fi
+AC_PATH_PROG([OPENSSL], [openssl])
+if test "x${LOCAL_OPENSSL}" != "x"; then
+    OPENSSL_VERSION_PRESENT="na"
+    OPENSSL_VERSION="${LOCAL_OPENSSL}"
+    rm -f nghttp2/gen/.nghttp2-installed nghttp2/gen/.openssl-installed
+elif test "x${OPENSSL}" = "x"; then
+    OPENSSL_VERSION_PRESENT="na"
+else 
+    OPENSSL_VERSION_PRESENT=$( ${OPENSSL} version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]* .*//g')
+fi
+
+case "$OPENSSL_VERSION_PRESENT" in
+    1.0.2*|1.1.*)
+        # acceptable
+        CURL_CONF="$CURL_CONF "'--with-nghttp2=$(prefix)'
+        ;;
+    *)
+        NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
+        INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL openssl($OPENSSL_VERSION)"
+        CURL_CONF="$CURL_CONF "'--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
+        if test "$OS" = "Darwin"; then
+            OPENSSL_CONF_CMD="./Configure"
+            OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc enable-egd"
+        else 
+            OPENSSL_CONF_CMD="./config"
+            OPENSSL_CONF="shared -fPIC enable-egd"
+            NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.libevent-installed"
+            INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libevent($LIBEVENT_VERSION)"
+        fi
+        ;;
+esac
 
+if test "$OS" = "Darwin"; then
+    NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
+    INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libev($LIBEV_VERSION) zlib($ZLIB_VERSION)"
 fi
 
 INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
@@ -410,6 +413,7 @@ AC_MSG_NOTICE([summary of build options:
     prefix:           ${prefix}
     APXS:             ${APXS}
     NGHTTP:           ${NGHTTP_INSTALLED}
+    OPENSSL:          ${OPENSSL_VERSION_PRESENT}
     CURL:             ${CURL_INSTALLED}
     download+install: ${INSTALL_ADDITIONAL:-n.a.}
 ])