From: Viktor Szakats Date: Fri, 4 Oct 2024 23:57:33 +0000 (+0200) Subject: build: add `ldap` to `libcurl.pc` `Requires:` X-Git-Tag: curl-8_11_0~225 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d960672246adf5bcb13c72a1806afa6c7d54c93;p=thirdparty%2Fcurl.git build: add `ldap` to `libcurl.pc` `Requires:` Closes #15163 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 28f93bd056..f75c1ee7d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -996,6 +996,7 @@ if(NOT CURL_DISABLE_LDAP) list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DLDAP_DEPRECATED=1") list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_LDAP_LIB}) set(CURL_LIBS "${CMAKE_LDAP_LIB};${CURL_LIBS}") + set(LIBCURL_PC_REQUIRES_PRIVATE "ldap;${LIBCURL_PC_REQUIRES_PRIVATE}") if(HAVE_LIBLBER) list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_LBER_LIB}) set(CURL_LIBS "${CMAKE_LBER_LIB};${CURL_LIBS}") diff --git a/acinclude.m4 b/acinclude.m4 index ef08969829..df893e05b8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -504,7 +504,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [ '-llber -lldap' \ '-lldapssl -lldapx -lldapsdk' \ '-lldapsdk -lldapx -lldapssl' \ - '-lldap -llber -lssl -lcrypto' ; do + '-lldap -llber -lssl -lcrypto'; do if test "$curl_cv_ldap_LIBS" = "unknown"; then if test -z "$x_nlibs"; then @@ -565,6 +565,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [ else LIBS="$curl_cv_ldap_LIBS $curl_cv_save_LIBS" fi + LIBCURL_PC_REQUIRES_PRIVATE="ldap $LIBCURL_PC_REQUIRES_PRIVATE" AC_MSG_RESULT([$curl_cv_ldap_LIBS]) ;; esac