Author: jelmer Date: 2007-04-30 08:53:56 +0000 (Mon, 30 Apr 2007) New Revision: 22596
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22596 Log: Set _CFLAGS variables rather than putting knowledge in the ldb Makefile. This should make it easier to allow use of system tdb or talloc libs using pkg-config. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:merge ...skipped... Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 08:08:36 UTC (rev 22595) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 08:53:56 UTC (rev 22596) @@ -18,11 +18,20 @@ [EMAIL PROTECTED]@ TESTS=test-tdb.sh @TESTS@ +TALLOC_LIBS = @TALLOC_LIBS@ +TALLOC_CFLAGS = @TALLOC_CFLAGS@ + +TDB_LIBS = @TDB_LIBS@ +TDB_CFLAGS = @TDB_CFLAGS@ + +POPT_LIBS = @POPT_LIBS@ +POPT_CFLAGS = @POPT_CFLAGS@ + CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ - @POPT_CFLAGS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \ + $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) [EMAIL PROTECTED]@ \ -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@[EMAIL PROTECTED]" -DUSE_MMAP=1 @CFLAGS@ [EMAIL PROTECTED]@ -Llib -lldb @LIBS@ @POPT_LIBS@ [EMAIL PROTECTED]@ -Llib -lldb @LIBS@ $(POPT_LIBS) LDB_TDB_DIR=ldb_tdb LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \ Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2007-04-30 08:08:36 UTC (rev 22595) +++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2007-04-30 08:53:56 UTC (rev 22596) @@ -15,6 +15,9 @@ TALLOCOBJ="talloc.o" AC_SUBST(TALLOCOBJ) +TALLOC_CFLAGS="-I$tallocdir" +AC_SUBST(TALLOC_CFLAGS) + AC_CHECK_SIZEOF(size_t,cross) AC_CHECK_SIZEOF(void *,cross) Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2007-04-30 08:08:36 UTC (rev 22595) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2007-04-30 08:53:56 UTC (rev 22596) @@ -17,6 +17,9 @@ AC_SUBST(TDBOBJ) AC_SUBST(LIBREPLACEOBJ) +TDB_CFLAGS="-I$tdbdir/include" +AC_SUBST(TDB_CFLAGS) + AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime) AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h)
