Commit 4061f74b authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* The libnghttp2.pc might be found in lib64 on 64 bit systems 

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

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