Re: svn commit: samba r18900 - in branches/SAMBA_3_0/source/lib/ldb/common: .

[tridge]

Volker,

  Next attempt to fix the Solaris build. Not sure about whether to merge this
  one. Tridge? Metze?

If you merge it, you'd need to expand lib/ldb/ldap.m4 to define
HAVE_LDAP_INITIALIZE. Otherwise this will just disable ldap in ldb :-)

Better still, you could use the lib/ldb/ldap.m4 configure test in
Samba3. It does already test for ldap_initialize(), and doesn't define
HAVE_LDAP unless its available. That keeps the testing for ldap in one
logical place, and means we don't have to put tests for both HAVE_LDAP
and HAVE_LDAP_INITIALIZE everywhere in the code.

Or you could expand the Samba3 configure tests to do the same (perhaps
grabbing bits of ldap.m4 from ldb).

Cheers, Tridge

svn commit: samba r18900 - in branches/SAMBA_3_0/source/lib/ldb/common: .

[vlendec]

Author: vlendec
Date: 2006-09-25 16:29:26 + (Mon, 25 Sep 2006)
New Revision: 18900

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18900

Log:
Next attempt to fix the Solaris build. Not sure about whether to merge this
one. Tridge? Metze?

Volker

Modified:
   branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c
===
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c  2006-09-25 
16:27:33 UTC (rev 18899)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c  2006-09-25 
16:29:26 UTC (rev 18900)
@@ -137,7 +137,7 @@
 
 #ifndef STATIC_ldb_MODULES
 
-#ifdef HAVE_LDAP
+#if defined(HAVE_LDAP)  defined(HAVE_LDAP_INITIALIZE)
 #define LDAP_INIT ldb_ldap_init,
 #else
 #define LDAP_INIT