Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 10 Mar 2003 22:49:28 -0000
Message-ID: <20030310224928.80897.qmail@icarus.apache.org>
From: jorton@apache.org
To: apr-util-cvs@apache.org
Subject: cvs commit: apr-util/include apr_ldap.h.in

jorton      2003/03/10 14:49:28

  Modified:    include  apr_ldap.h.in
  Log:
  Fix apr-util build on Unix with OpenLDAP until someone who cares
  about proprietary LDAP toolkits brings apu-conf.m4 up to speed.
  
  Revision  Changes    Path
  1.8       +11 -0     apr-util/include/apr_ldap.h.in
  
  Index: apr_ldap.h.in
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_ldap.h.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_ldap.h.in	14 Feb 2003 16:07:19 -0000	1.7
  +++ apr_ldap.h.in	10 Mar 2003 22:49:27 -0000	1.8
  @@ -91,6 +91,8 @@
   
   #else /* ldap support available */
   
  +#ifdef APR_NOT_READY_YET
  +/* FIXME: this code awaits support from apu-conf.m4 */
   
      /* There a several LDAPv3 SDKs available on various platforms
       * define which LDAP SDK is used 
  @@ -104,6 +106,15 @@
      /* define if LDAP SSL support is available 
      */
   #define APR_HAS_LDAP_SSL            @apu_has_ldap_ssl@
  +
  +#else /* APR_NOT_READY_YET */
  +
  +/* FIXME: remove this when above code works.  Default to build with
  + * OpenLDAP until apu-conf.m4 support exists */
  +#define APR_HAS_OPENLDAP_LDAPSDK 1 
  +#define APR_HAS_LDAP_SSL 1
  +
  +#endif /* APR_NOT_READY_YET */
   
      /* If no APR_HAS_xxx_LDAPSDK is defined error out
       * Define if the SDK supports the ldap_url_parse function