sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

r17721: fixed the dlopen and MODULESDIR handling in the standalone build

Browse Source 
(This used to be commit a40e8c210a27a88e01b023c8b6d298e271c147d7)
This commit is contained in:
Andrew Tridgell 2006-08-22 22:27:57 +00:00 committed by Gerald (Jerry) Carter
parent 10d8142e5d
commit ba8ed91a75
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/lib/ldb/Makefile.in
View File

@ -17,7 +17,8 @@ EXTRA_OBJ=@EXTRA_OBJ@
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@

7
source4/lib/ldb/configure.in
View File

@ -37,13 +37,16 @@ AC_PATH_PROG(GCOV,gcov)
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)