diff --git a/CMakeLists.txt b/CMakeLists.txt index a14af9083e50cb..dba2b0fd570f96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -675,9 +675,7 @@ if(NOT CURL_DISABLE_LDAP) endif() # Now that we know, we're not using windows LDAP... - if(USE_WIN32_LDAP) - check_include_file_concat("winldap.h" HAVE_WINLDAP_H) - else() + if(NOT USE_WIN32_LDAP) # Check for LDAP set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) check_library_exists_concat(${CMAKE_LDAP_LIB} ldap_init HAVE_LIBLDAP) diff --git a/acinclude.m4 b/acinclude.m4 index b3025afe7336b5..5dbdd93fef0770 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -345,46 +345,6 @@ AC_DEFUN([CURL_CHECK_HEADER_WINCRYPT], [ ]) -dnl CURL_CHECK_HEADER_WINLDAP -dnl ------------------------------------------------- -dnl Check for compilable and valid winldap.h header - -AC_DEFUN([CURL_CHECK_HEADER_WINLDAP], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl - AC_CACHE_CHECK([for winldap.h], [curl_cv_header_winldap_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#undef inline -#ifdef HAVE_WINDOWS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif -#include - ]],[[ -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINLDAP_H shall not be defined. -#else - LDAP *ldp = ldap_init("dummy", LDAP_PORT); - ULONG res = ldap_unbind(ldp); -#endif - ]]) - ],[ - curl_cv_header_winldap_h="yes" - ],[ - curl_cv_header_winldap_h="no" - ]) - ]) - case "$curl_cv_header_winldap_h" in - yes) - AC_DEFINE_UNQUOTED(HAVE_WINLDAP_H, 1, - [Define to 1 if you have the winldap.h header file.]) - ;; - esac -]) - - dnl CURL_CHECK_HEADER_LBER dnl ------------------------------------------------- dnl Check for compilable and valid lber.h header, @@ -612,9 +572,7 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [ #define WIN32_LEAN_AND_MEAN #endif #include -#ifdef HAVE_WINLDAP_H #include -#endif #ifdef HAVE_WINBER_H #include #endif diff --git a/configure.ac b/configure.ac index 0f316d0bb87872..afbc0419e46a1e 100644 --- a/configure.ac +++ b/configure.ac @@ -677,13 +677,11 @@ case X-"$curl_cv_native_windows" in CURL_CHECK_HEADER_WINSOCK2 CURL_CHECK_HEADER_WS2TCPIP CURL_CHECK_HEADER_WINCRYPT - CURL_CHECK_HEADER_WINLDAP ;; *) curl_cv_header_winsock2_h="no" curl_cv_header_ws2tcpip_h="no" curl_cv_header_wincrypt_h="no" - curl_cv_header_winldap_h="no" ;; esac CURL_CHECK_WIN32_LARGEFILE diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index eca71bdef6da14..9c78586133c8b7 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -577,9 +577,6 @@ /* Define to 1 if you have the windows.h header file. */ #cmakedefine HAVE_WINDOWS_H 1 -/* Define to 1 if you have the winldap.h header file. */ -#cmakedefine HAVE_WINLDAP_H 1 - /* Define to 1 if you have the winsock2.h header file. */ #cmakedefine HAVE_WINSOCK2_H 1