From: Stefan Eissing <icing@apache.org>
Date: Wed, 23 Sep 2015 12:16:05 +0000 (+0000)
Subject: latest changes from branches/2.4.x, merged --enable-http2 from trunk
X-Git-Tag: 2.4.17~79^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ce7ad2f8525ff92ef5ee9fd96420d562042c237;p=thirdparty%2Fapache%2Fhttpd.git

latest changes from branches/2.4.x, merged --enable-http2 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704828 13f79535-47bb-0310-9956-ffa450edef68
---

8ce7ad2f8525ff92ef5ee9fd96420d562042c237
diff --cc modules/http2/config.m4
index 6bb231fbb87,00000000000..4da7d25362a
mode 100644,000000..100644
--- a/modules/http2/config.m4
+++ b/modules/http2/config.m4
@@@ -1,186 -1,0 +1,202 @@@
 +dnl Licensed to the Apache Software Foundation (ASF) under one or more
 +dnl contributor license agreements.  See the NOTICE file distributed with
 +dnl this work for additional information regarding copyright ownership.
 +dnl The ASF licenses this file to You under the Apache License, Version 2.0
 +dnl (the "License"); you may not use this file except in compliance with
 +dnl the License.  You may obtain a copy of the License at
 +dnl
 +dnl      http://www.apache.org/licenses/LICENSE-2.0
 +dnl
 +dnl Unless required by applicable law or agreed to in writing, software
 +dnl distributed under the License is distributed on an "AS IS" BASIS,
 +dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +dnl See the License for the specific language governing permissions and
 +dnl limitations under the License.
 +
 +dnl #  start of module specific part
 +APACHE_MODPATH_INIT(http2)
 +
 +dnl #  list of module object files
 +h2_objs="dnl
 +mod_h2.lo dnl
 +h2_alt_svc.lo dnl
 +h2_config.lo dnl
 +h2_conn.lo dnl
 +h2_conn_io.lo dnl
 +h2_ctx.lo dnl
 +h2_from_h1.lo dnl
 +h2_h2.lo dnl
 +h2_io.lo dnl
 +h2_io_set.lo dnl
 +h2_mplx.lo dnl
 +h2_request.lo dnl
 +h2_response.lo dnl
 +h2_session.lo dnl
 +h2_stream.lo dnl
 +h2_stream_set.lo dnl
 +h2_switch.lo dnl
 +h2_task.lo dnl
 +h2_task_input.lo dnl
 +h2_task_output.lo dnl
 +h2_task_queue.lo dnl
 +h2_to_h1.lo dnl
 +h2_util.lo dnl
 +h2_worker.lo dnl
 +h2_workers.lo dnl
 +"
 +
 +dnl
 +dnl APACHE_CHECK_NGHTTP2
 +dnl
 +dnl Configure for nghttp2, giving preference to
 +dnl "--with-nghttp2=<path>" if it was specified.
 +dnl
 +AC_DEFUN(APACHE_CHECK_NGHTTP2,[
 +  AC_CACHE_CHECK([for nghttp2], [ac_cv_nghttp2], [
 +    dnl initialise the variables we use
 +    ac_cv_nghttp2=no
 +    ap_nghttp2_found=""
 +    ap_nghttp2_base=""
 +    ap_nghttp2_libs=""
 +
 +    dnl Determine the nghttp2 base directory, if any
 +    AC_MSG_CHECKING([for user-provided nghttp2 base directory])
 +    AC_ARG_WITH(nghttp2, APACHE_HELP_STRING(--with-nghttp2=PATH, nghttp2 installation directory), [
 +      dnl If --with-nghttp2 specifies a directory, we use that directory
 +      if test "x$withval" != "xyes" -a "x$withval" != "x"; then
 +        dnl This ensures $withval is actually a directory and that it is absolute
 +        ap_nghttp2_base="`cd $withval ; pwd`"
 +      fi
 +    ])
 +    if test "x$ap_nghttp2_base" = "x"; then
 +      AC_MSG_RESULT(none)
 +    else
 +      AC_MSG_RESULT($ap_nghttp2_base)
 +    fi
 +
 +    dnl Run header and version checks
 +    saved_CPPFLAGS="$CPPFLAGS"
 +    saved_LIBS="$LIBS"
 +    saved_LDFLAGS="$LDFLAGS"
 +
 +    dnl Before doing anything else, load in pkg-config variables
 +    if test -n "$PKGCONFIG"; then
 +      saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 +      AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH])
 +      if test "x$ap_nghttp2_base" != "x" -a \
 +              -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then
 +        dnl Ensure that the given path is used by pkg-config too, otherwise
 +        dnl the system libnghttp2.pc might be picked up instead.
 +        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
 +      ])
 +      ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`"
 +      if test $? -eq 0; then
 +        ap_nghttp2_found="yes"
 +        pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`"
 +        APR_ADDTO(CPPFLAGS, [$pkglookup])
 +        APR_ADDTO(MOD_CFLAGS, [$pkglookup])
 +        APR_ADDTO(ab_CFLAGS, [$pkglookup])
 +        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
 +        APR_ADDTO(LDFLAGS, [$pkglookup])
 +        APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
 +        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`"
 +        APR_ADDTO(LDFLAGS, [$pkglookup])
 +        APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
 +      fi
 +      PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
 +    fi
 +
 +    dnl fall back to the user-supplied directory if not found via pkg-config
 +    if test "x$ap_nghttp2_base" != "x" -a "x$ap_nghttp2_found" = "x"; then
 +      APR_ADDTO(CPPFLAGS, [-I$ap_nghttp2_base/include])
 +      APR_ADDTO(MOD_CFLAGS, [-I$ap_nghttp2_base/include])
 +      APR_ADDTO(ab_CFLAGS, [-I$ap_nghttp2_base/include])
 +      APR_ADDTO(LDFLAGS, [-L$ap_nghttp2_base/lib])
 +      APR_ADDTO(MOD_LDFLAGS, [-L$ap_nghttp2_base/lib])
 +      if test "x$ap_platform_runtime_link_flag" != "x"; then
 +        APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_nghttp2_base/lib])
 +        APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_nghttp2_base/lib])
 +      fi
 +    fi
 +
 +    AC_MSG_CHECKING([for nghttp2 version >= 1.0.0])
 +    AC_TRY_COMPILE([#include <nghttp2/nghttp2ver.h>],[
 +#if !defined(NGHTTP2_VERSION_NUM)
 +#error "Missing nghttp2 version"
 +#endif
 +#if NGHTTP2_VERSION_NUM < 0x010000
 +#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT
 +#endif],
 +      [AC_MSG_RESULT(OK)
 +       ac_cv_nghttp2=yes],
 +      [AC_MSG_RESULT(FAILED)])
 +
 +    if test "x$ac_cv_nghttp2" = "xyes"; then
 +      ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`"
 +      APR_ADDTO(MOD_LDFLAGS, [$ap_nghttp2_libs])
 +      APR_ADDTO(LIBS, [$ap_nghttp2_libs])
 +      APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])
 +      APACHE_SUBST(ab_CFLAGS)
 +      APACHE_SUBST(ab_LDFLAGS)
 +
 +      dnl Run library and function checks
 +      liberrors=""
 +      AC_CHECK_HEADERS([nghttp2/nghttp2.h])
 +      AC_CHECK_FUNCS([nghttp2_session_server_new2], [], [liberrors="yes"])
 +      if test "x$liberrors" != "x"; then
 +        AC_MSG_WARN([nghttp2 library is unusable])
 +      fi
 +    else
 +      AC_MSG_WARN([nghttp2 version is too old])
 +    fi
 +
 +    dnl restore
 +    CPPFLAGS="$saved_CPPFLAGS"
 +    LIBS="$saved_LIBS"
 +    LDFLAGS="$saved_LDFLAGS"
 +  ])
 +  if test "x$ac_cv_nghttp2" = "xyes"; then
 +    AC_DEFINE(HAVE_NGHTTP2, 1, [Define if nghttp2 is available])
 +  fi
 +])
 +
 +
- 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
 +           # 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
 +])
 +
 +dnl #  end of module specific part
 +APACHE_MODPATH_FINISH
 +