summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-06 03:19:07 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:28 +0100
commitf0be600e0dc1c768cbb9b65f56fa4d344b23c335 (patch)
treec52442a7e78f01f46ad1e233507c528aa3bfdd40
parenta0e67315a407445ed14a31dce37ebf5e798e27a8 (diff)
downloadsamba-f0be600e0dc1c768cbb9b65f56fa4d344b23c335.tar.gz
samba-f0be600e0dc1c768cbb9b65f56fa4d344b23c335.tar.bz2
samba-f0be600e0dc1c768cbb9b65f56fa4d344b23c335.zip
r25854: Link against -ldl properly.
(This used to be commit 6c46a925288e6be0a0e5f86e5a57ce269dc7a3df)
-rw-r--r--source4/lib/ldb/Makefile.in4
-rw-r--r--source4/lib/ldb/configure.ac1
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 9762d667c6..f5820cb493 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -32,6 +32,8 @@ POPT_OBJ = @POPT_OBJ@
LDAP_LIBS = @LDAP_LIBS@
+LIBDL = @LIBDL@
+
SHLIBEXT = @SHLIBEXT@
LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
@@ -46,7 +48,7 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@
LIB_FLAGS=$(LDFLAGS) -Llib -lldb $(LIBS) $(POPT_LIBS) $(TALLOC_LIBS) \
- $(TDB_LIBS) $(LDAP_LIBS)
+ $(TDB_LIBS) $(LDAP_LIBS) $(LIBDL)
LDB_TDB_DIR=ldb_tdb
LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \
diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac
index d6f6a4996e..ff100bb2e0 100644
--- a/source4/lib/ldb/configure.ac
+++ b/source4/lib/ldb/configure.ac
@@ -36,7 +36,6 @@ AC_PATH_PROG(GCOV,gcov)
AC_PATH_PROG(SLAPD,slapd)
AC_CHECK_HEADERS(stdint.h dlfcn.h)
AC_CONFIG_HEADER(include/config.h)
-AC_SEARCH_LIBS(dlopen, dl, AC_DEFINE(HAVE_DLOPEN, [1], [have dlopen]))
AC_DEFINE_UNQUOTED(LDB_MODULESDIR, LIBDIR "/ldb" , [Modules directory] )
AC_SUBST(LDB_MODULESDIR)