]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
configure: if asked for, fail if ldap is not found
authorDaniel Stenberg <daniel@haxx.se>
Wed, 12 May 2021 09:15:51 +0000 (11:15 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 13 May 2021 09:52:17 +0000 (11:52 +0200)
Reported-by: Jakub Zakrzewski
Fixes #7053
Closes #7055

configure.ac

index 8b3ff904c1a6e06783ef1ec9e0ae71d372d928f6..5c697618b9f2755f32e4f4f52a19291fffbd0acd 100755 (executable)
@@ -552,6 +552,10 @@ AS_HELP_STRING([--disable-ldap],[Disable LDAP support]),
        AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
        AC_SUBST(CURL_DISABLE_LDAP, [1])
        ;;
+  yes)
+       ldap_askedfor="yes"
+       AC_MSG_RESULT(yes)
+       ;;
   *)
        AC_MSG_RESULT(yes)
        ;;
@@ -1356,6 +1360,9 @@ if test x$CURL_DISABLE_LDAP != x1 ; then
 
   if test "$LDAPLIBNAME" ; then
     AC_CHECK_LIB("$LDAPLIBNAME", ldap_init,, [
+      if test -n "$ldap_askedfor"; then
+        AC_MSG_ERROR([couldn't detect the LDAP libraries])
+      fi
       AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled])
       AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
       AC_SUBST(CURL_DISABLE_LDAP, [1])
@@ -1366,6 +1373,9 @@ if test x$CURL_DISABLE_LDAP != x1 ; then
     CURL_CHECK_LIBS_LDAP
     case X-"$curl_cv_ldap_LIBS" in
       X-unknown)
+        if test -n "$ldap_askedfor"; then
+          AC_MSG_ERROR([couldn't detect the LDAP libraries])
+        fi
         AC_MSG_WARN([Cannot find libraries for LDAP support: LDAP disabled])
         AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
         AC_SUBST(CURL_DISABLE_LDAP, [1])