svn commit: samba r17721 - in branches/SAMBA_4_0/source/lib/ldb: .

[tridge at samba.org]

Author: tridge
Date: 2006-08-22 22:27:57 +0000 (Tue, 22 Aug 2006)
New Revision: 17721

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17721

Log:

fixed the dlopen and MODULESDIR handling in the standalone build

Modified:
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-08-22 20:49:58 UTC (rev 17720)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2006-08-22 22:27:57 UTC (rev 17721)
@@ -17,7 +17,8 @@
 TESTS=test-tdb.sh @TESTS@
 
 CFLAGS=-I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
-       -I$(srcdir)/../tdb/include -I$(srcdir)/../tdb -I$(srcdir)/../talloc -DUSE_MMAP=1 @CFLAGS@
+       -I$(srcdir)/../tdb/include -I$(srcdir)/../tdb -I$(srcdir)/../talloc \
+	-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
 
 LIB_FLAGS=-Llib -lldb @LIBS@
 

Modified: branches/SAMBA_4_0/source/lib/ldb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.in	2006-08-22 20:49:58 UTC (rev 17720)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.in	2006-08-22 22:27:57 UTC (rev 17721)
@@ -37,13 +37,16 @@
 AC_PATH_PROG(SLAPD,slapd)
 AC_CHECK_HEADERS(stdint.h dlfcn.h)
 AC_CONFIG_HEADER(include/config.h)
+AC_CHECK_LIB(dl, dlopen)
 AC_CHECK_FUNCS(dlopen dlsym dlclose)
 
+AC_CHECK_TYPE(comparison_fn_t, 
+[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
+
 SHLIBEXT="so" # Should be set based on OS later on
 AC_SUBST(SHLIBEXT)
 
-MODULESDIR="$libdir/ldb"
-AC_DEFINE(MODULESDIR,$MODULESDIR,[Modules directory])
+AC_DEFINE_UNQUOTED(MODULESDIR, LIBDIR "/ldb" , [Modules directory] )
 AC_SUBST(MODULESDIR)
 
 sinclude(popt.m4)