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

[ji...@apache.org]

Author: jim
Date: Thu Oct 11 17:55:50 2018
New Revision: 1843577

URL: http://svn.apache.org/viewvc?rev=1843577&view=rev
Log:
first step in trying to make this test stop try to build curl. I have curl. The right one. With HTTP2 support. So why do we need to rebuild? Who knows. But now I need to figure out what to do about clients/Makefile*


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=1843577&r1=1843576&r2=1843577&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Thu Oct 11 17:55:50 2018
@@ -62,6 +62,10 @@ AC_ARG_WITH([local-openssl], [AS_HELP_ST
     [Use a locally built OpenSSL library [default=<ignore>]])],
     [LOCAL_OPENSSL=$withval], [LOCAL_OPENSSL=])
 
+AC_ARG_WITH([macos-ok], [AS_HELP_STRING([--with-macos-ok],
+    [macOS setup is OK [default=<ignore>]])],
+    [MACOS_OK=$withval], [MACOS_OK=])
+
 export BUILD_SUBDIRS="clients mh2fuzz"
 
 AC_MSG_NOTICE("configuring build")
@@ -131,7 +135,7 @@ TEST_DEP=""
 CURL_VERSION=7.61.1
 
 AC_PATH_PROG([CURL], [curl])
-CURL=""
+#CURL=""
 if test "x${CURL}" != "x"; then
     feats="$( ${CURL} -V | grep 'Features:.*HTTP2' )"
     if test "x$feats" = "x"; then
@@ -149,8 +153,8 @@ if test -x "${prefix}/bin/curl"; then
 fi
 
 # force a local curl
-#if test "x${CURL}" = "x"; then
-if test "x" = "x"; then
+if test "x${CURL}" = "x"; then
+#if test "x" = "x"; then
     CURL="${prefix}/bin/curl"
     INSTALL_DEP="install-client"
     INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL curl($CURL_VERSION)"
@@ -309,7 +313,7 @@ case "$OPENSSL_VERSION_PRESENT" in
         ;;
 esac
 
-if test "$OS" = "Darwin"; then
+if test "$OS" = "Darwin" -a "x$MACOS_OK" != "xyes"; then
     NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
     INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libev($LIBEV_VERSION) zlib($ZLIB_VERSION)"
 fi