diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-09-29 07:57:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:30 -0500 |
| commit | 91a0879b1f317bf3f64867cd4f9494afab30ca2d (patch) | |
| tree | 9050aff52f12106901b105bf6eee98a256d72190 | |
| parent | 7f0904cb1ab83a45f399b19f7a79debc0a7feac8 (diff) | |
| download | samba-91a0879b1f317bf3f64867cd4f9494afab30ca2d.tar.gz samba-91a0879b1f317bf3f64867cd4f9494afab30ca2d.tar.bz2 samba-91a0879b1f317bf3f64867cd4f9494afab30ca2d.zip | |
r25425: move LDB_MODULESDIR define into config.h
this hopefully fixes the build on some hosts
metze
(This used to be commit d03ec5655d84c1f0f8bdcc88398067651cf7d78c)
| -rw-r--r-- | source4/configure.ac | 18 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 7 |
2 files changed, 18 insertions, 7 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index bdbb2249a9..52be29c022 100644 --- a/source4/configure.ac +++ b/source4/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/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index a03c9fb075..6472612837 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/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] |