diff --git a/modules/http2/config2.m4 b/modules/http2/config2.m4 index e8cefe3..904e519 100644 --- a/modules/http2/config2.m4 +++ b/modules/http2/config2.m4 @@ -81,12 +81,12 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[ saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH]) if test "x$ap_nghttp2_base" != "x" ; then - if test -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then + if test -f "${ap_nghttp2_base}/lib/pkgconfig/httpd24-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 + elif test -f "${ap_nghttp2_base}/lib64/pkgconfig/httpd24-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}" @@ -98,16 +98,16 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[ PKGCONFIG_LIBOPTS="--static" fi ]) - ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`" + ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors httpd24-libnghttp2`" if test $? -eq 0; then ap_nghttp2_found="yes" - pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`" + pkglookup="`$PKGCONFIG --cflags-only-I httpd24-libnghttp2`" APR_ADDTO(CPPFLAGS, [$pkglookup]) APR_ADDTO(MOD_CFLAGS, [$pkglookup]) - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L httpd24-libnghttp2`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other httpd24-libnghttp2`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) fi