diff --git a/modules/md/config2.m4 b/modules/md/config2.m4 index f154107..6a57dd4 100644 --- a/modules/md/config2.m4 +++ b/modules/md/config2.m4 @@ -52,12 +52,12 @@ AC_DEFUN([APACHE_CHECK_CURL],[ saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH]) if test "x$ap_curl_base" != "x" ; then - if test -f "${ap_curl_base}/lib/pkgconfig/libcurl.pc"; then + if test -f "${ap_curl_base}/lib/pkgconfig/httpd24-libcurl.pc"; then dnl Ensure that the given path is used by pkg-config too, otherwise dnl the system libcurl.pc might be picked up instead. PKG_CONFIG_PATH="${ap_curl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH - elif test -f "${ap_curl_base}/lib64/pkgconfig/libcurl.pc"; then + elif test -f "${ap_curl_base}/lib64/pkgconfig/httpd24-libcurl.pc"; then dnl Ensure that the given path is used by pkg-config too, otherwise dnl the system libcurl.pc might be picked up instead. PKG_CONFIG_PATH="${ap_curl_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" @@ -69,16 +69,16 @@ AC_DEFUN([APACHE_CHECK_CURL],[ PKGCONFIG_LIBOPTS="--static" fi ]) - ap_curl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libcurl`" + ap_curl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors httpd24-libcurl`" if test $? -eq 0; then ap_curl_found="yes" - pkglookup="`$PKGCONFIG --cflags-only-I libcurl`" + pkglookup="`$PKGCONFIG --cflags-only-I httpd24-libcurl`" APR_ADDTO(CPPFLAGS, [$pkglookup]) APR_ADDTO(MOD_CFLAGS, [$pkglookup]) - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libcurl`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L httpd24-libcurl`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libcurl`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other httpd24-libcurl`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) fi