Commit ae621ba9 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Revert r1131393: 

    Several fixes for the ap_ldap build logic. This should fix compilation
    without --with-ldap.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150165 13f79535-47bb-0310-9956-ffa450edef68
parent 9cf2757f

build/find_ldap.m4

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ AC_DEFUN([AP_FIND_LDAPLIB], [ 
        AC_CHECK_LIB(${ldaplib}, ldapssl_init, ap_has_ldapssl_init="1", , ${extralib})

        AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, ap_has_ldapssl_install_routines="1", , ${extralib})

        ap_has_ldap="1";

        AC_DEFINE(AP_HAS_LDAP, 1, [Defined if httpd is compiled with ldap support])

      ], , ${extralib})

  fi

])

configure.in

+0 −3
Original line number Diff line number Diff line
@@ -457,9 +457,6 @@ if test "$ac_cv_gettid" = "yes"; then 
    AC_DEFINE(HAVE_GETTID, 1, [Define if you have gettid()])

fi



dnl check for LDAP support, needed by modules/aaa and modules/ldap

AP_FIND_LDAP



dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs

AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,

[AC_TRY_COMPILE([#include <sys/types.h>

include/ap_ldap.h.in

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ 
#define LDAP_DECLARE_DATA             __declspec(dllimport)

#endif



/* this will be defined if LDAP support was compiled into apr-util */

#define AP_HAS_LDAP		  @ap_has_ldap@



/* identify the LDAP toolkit used */

#define AP_HAS_NETSCAPE_LDAPSDK  @ap_has_ldap_netscape@

#define AP_HAS_SOLARIS_LDAPSDK   @ap_has_ldap_solaris@

include/ap_ldap_init.h

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
 * @{

 */



#if AP_HAS_LDAP



#include "ap_ldap.h"



#if AP_HAS_LDAP



#ifdef __cplusplus

extern "C" {

#endif /* __cplusplus */

include/ap_ldap_option.h

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
 * @{

 */



#if AP_HAS_LDAP



#include "ap_ldap.h"



#if AP_HAS_LDAP



#ifdef __cplusplus

extern "C" {

#endif /* __cplusplus */