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