From: Stefan Eissing <icing@apache.org>
Date: Wed, 23 Sep 2015 12:06:41 +0000 (+0000)
Subject: adding --enable-http2 as preferred config option
X-Git-Tag: 2.5.0-alpha~2814
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93eb6be6c42f7bc44e20275c2d34266c1b383eb8;p=apache

adding --enable-http2 as preferred config option

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

diff --git a/modules/http2/config.m4 b/modules/http2/config.m4
index 6bb231fbb8..4da7d25362 100644
--- a/modules/http2/config.m4
+++ b/modules/http2/config.m4
@@ -90,7 +90,7 @@ AC_DEFUN(APACHE_CHECK_NGHTTP2,[
         PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
         export PKG_CONFIG_PATH
       fi
-      AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_h2 with dependencies of libnghttp2's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-h2.]), [
+      AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_h2 with dependencies of libnghttp2's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-http2.]), [
         if test "$enableval" = "yes"; then
           PKGCONFIG_LIBOPTS="--static"
         fi
@@ -167,8 +167,24 @@ AC_DEFUN(APACHE_CHECK_NGHTTP2,[
 ])
 
 
-dnl #  hook module into the Autoconf mechanism (--enable-h2 option)
-APACHE_MODULE(h2, [HTTP/2 support (mod_h2)], $h2_objs, , most, [
+dnl # hook module into the Autoconf mechanism (--enable-http2 or 
+dnl # --enabled-h2 option,)
+APACHE_MODULE(http2, [HTTP/2 protocol handling in addition to HTTP protocol 
+handling. Implemented by mod_h2. This module requires a libnghttp2 installation. 
+See --with-nghttp2 on how to manage non-standard locations. This module
+is usually linked shared and requires loading. ], $h2_objs, , most, [
+    APACHE_CHECK_NGHTTP2
+    if test "$ac_cv_nghttp2" = "yes" ; then
+        if test "x$enable_ssl" = "xshared"; then
+           # The only symbol which needs to be exported is the module
+           # structure, so ask libtool to hide everything else:
+           APR_ADDTO(MOD_H2_LDADD, [-export-symbols-regex h2_module])
+        fi
+    else
+        enable_h2=no
+    fi
+])
+APACHE_MODULE(h2, [HTTP/2 support (Deprecated. Use --enable-http2)], $h2_objs, , most, [
     APACHE_CHECK_NGHTTP2
     if test "$ac_cv_nghttp2" = "yes" ; then
         if test "x$enable_ssl" = "xshared"; then