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

[metze at samba.org]

Author: metze
Date: 2007-09-29 07:57:13 +0000 (Sat, 29 Sep 2007)
New Revision: 25425

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

Log:
move LDB_MODULESDIR define into config.h
this hopefully fixes the build on some hosts

metze
Modified:
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/lib/ldb/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-09-29 07:18:23 UTC (rev 25424)
+++ branches/SAMBA_4_0/source/configure.ac	2007-09-29 07:57:13 UTC (rev 25425)
@@ -48,8 +48,26 @@
 		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)

Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-09-29 07:18:23 UTC (rev 25424)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-09-29 07:57:13 UTC (rev 25425)
@@ -123,13 +123,6 @@
 # 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]