r25425: move LDB_MODULESDIR define into config.h

this hopefully fixes the build on some hosts

metze

diff --git a/source/configure.ac b/source/configure.ac
index bdbb2249a981147a01149fb900c4005332a26511..52be29c022854822b9071828fec86525e695fe86 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -48,8 +48,26 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
                SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
                SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
                SMB_SUBSYSTEM(ldb_map, [], [LIBLDB])
+               define_ldb_modulesdir=no
        ],
        [
+               # Here we need to do some tricks
+               # with AC_CONFIG_COMMANDS_PRE
+               # as that's the deferrs the commands
+               # to location after $prefix and $exec_prefix
+               # have usefull values and directly before
+               # creating config.status.
+               #
+               # The 'eval eval echo' trick is used to
+               # actually get the raw absolute directory
+               # path as this is needed in config.h
+               define_ldb_modulesdir=yes
+               AC_CONFIG_COMMANDS_PRE([
+               if test x"$define_ldb_modulesdir" = x"yes";then
+                       LDB_MODULESDIR=`eval eval echo ${modulesdir}/ldb`
+                       AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
+               fi
+               ])
                m4_include(lib/ldb/sqlite3.m4)
                m4_include(lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(lib/ldb/config.mk)

diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index a03c9fb0752cc820a35c0ffd70b665177f7913ad..6472612837718b96f1d242db8ec93a1affd3c647 100644 (file)
--- a/source/lib/ldb/config.mk
+++ b/source/lib/ldb/config.mk
@@ -123,13 +123,6 @@ PRIVATE_DEPENDENCIES = \
 # End MODULE ldb_tdb
 ################################################
 
-./lib/ldb/common/ldb.o: lib/ldb/common/ldb.c Makefile
-       @echo Compiling $<
-       @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \
-       -DLDB_MODULESDIR=\"$(MODULESDIR)/ldb\" \
-       -c $(FIRST_PREREQ) -o $@
-
-
 ################################################
 # Start SUBSYSTEM ldb
 [LIBRARY::LIBLDB]