|
 |
69c05d |
diff --git a/modules/http2/config2.m4 b/modules/http2/config2.m4
|
|
|
69c05d |
index e8cefe3..904e519 100644
|
|
|
69c05d |
--- a/modules/http2/config2.m4
|
|
|
69c05d |
+++ b/modules/http2/config2.m4
|
|
|
69c05d |
@@ -81,12 +81,12 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[
|
|
|
69c05d |
saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
|
|
|
69c05d |
AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH])
|
|
|
69c05d |
if test "x$ap_nghttp2_base" != "x" ; then
|
|
|
69c05d |
- if test -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then
|
|
|
69c05d |
+ if test -f "${ap_nghttp2_base}/lib/pkgconfig/httpd24-libnghttp2.pc"; then
|
|
|
69c05d |
dnl Ensure that the given path is used by pkg-config too, otherwise
|
|
|
69c05d |
dnl the system libnghttp2.pc might be picked up instead.
|
|
|
69c05d |
PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
|
|
|
69c05d |
export PKG_CONFIG_PATH
|
|
|
69c05d |
- elif test -f "${ap_nghttp2_base}/lib64/pkgconfig/libnghttp2.pc"; then
|
|
|
69c05d |
+ elif test -f "${ap_nghttp2_base}/lib64/pkgconfig/httpd24-libnghttp2.pc"; then
|
|
|
69c05d |
dnl Ensure that the given path is used by pkg-config too, otherwise
|
|
|
69c05d |
dnl the system libnghttp2.pc might be picked up instead.
|
|
|
69c05d |
PKG_CONFIG_PATH="${ap_nghttp2_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
|
|
|
69c05d |
@@ -98,16 +98,16 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[
|
|
|
69c05d |
PKGCONFIG_LIBOPTS="--static"
|
|
|
69c05d |
fi
|
|
|
69c05d |
])
|
|
|
69c05d |
- ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`"
|
|
|
69c05d |
+ ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors httpd24-libnghttp2`"
|
|
|
69c05d |
if test $? -eq 0; then
|
|
|
69c05d |
ap_nghttp2_found="yes"
|
|
|
69c05d |
- pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`"
|
|
|
69c05d |
+ pkglookup="`$PKGCONFIG --cflags-only-I httpd24-libnghttp2`"
|
|
|
69c05d |
APR_ADDTO(CPPFLAGS, [$pkglookup])
|
|
|
69c05d |
APR_ADDTO(MOD_CFLAGS, [$pkglookup])
|
|
|
69c05d |
- pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
|
|
|
69c05d |
+ pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L httpd24-libnghttp2`"
|
|
|
69c05d |
APR_ADDTO(LDFLAGS, [$pkglookup])
|
|
|
69c05d |
APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
|
|
|
69c05d |
- pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`"
|
|
|
69c05d |
+ pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other httpd24-libnghttp2`"
|
|
|
69c05d |
APR_ADDTO(LDFLAGS, [$pkglookup])
|
|
|
69c05d |
APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
|
|
|
69c05d |
fi
|