Commit 79c9a564 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1799341 from trunk: 

* The libnghttp2.pc might be found in lib64 on 64 bit systems
Submitted by: rpluem
Reviewed by: rpluem, icing, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1812393 13f79535-47bb-0310-9956-ffa450edef68
parent 10a33af9

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   *) mod_http2 / mod_proxy_http2: Detect libnghttp2.pc correctly if installed

      in lib64 directory instead of lib directory on 64 bit systems.

      Trunk version of patch:

         svn merge -c 1799341 ^/httpd/httpd/trunk .

      Backport version for 2.2.x of patch:

         Trunk version of patch works

      +1: rpluem, icing, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/http2/config2.m4

+12 −6
Original line number Diff line number Diff line
@@ -80,12 +80,18 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[ 
    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

      if test "x$ap_nghttp2_base" != "x" ; then

        if test -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

        elif test -f "${ap_nghttp2_base}/lib64/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}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"

          export PKG_CONFIG_PATH

        fi

      fi

      AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_http2 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