Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit 11102681bcd70b0abb2df38bcdc7fdec51e71600)

7 files changed, 14 insertions, 11 deletions

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index d3e027425b..756beb1fed 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -19,6 +19,7 @@ SWIG = swig
 EXTRA_OBJ=@EXTRA_OBJ@
 TESTS=test-tdb.sh @TESTS@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PYTHON = @PYTHON@
 PYTHON_CONFIG = @PYTHON_CONFIG@
 tdbdir = @tdbdir@
 ldbdir = $(srcdir)
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index ec4c34f6d8..6119f085d8 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -68,7 +68,7 @@ examples/ldifreader: examples/ldifreader.o $(LIBS)
 build-python:: _ldb.$(SHLIBEXT)
 
 ldb_wrap.o: $(ldbdir)/ldb_wrap.c
-	$(CC) -c $(ldbdir)/ldb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
+	$(CC) $(PICFLAG) -c $(ldbdir)/ldb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
 	
 _ldb.$(SHLIBEXT): $(LIBS) ldb_wrap.o
 	$(SHLD) $(SHLD_FLAGS) -o _ldb.$(SHLIBEXT) ldb_wrap.o $(LIB_FLAGS)
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 9e949f900f..540a05d100 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,5 +1,5 @@
 [LIBRARY::LIBTALLOC]
-VERSION = 1.1.0
+VERSION = 1.2.0
 SO_VERSION = 1
 OBJ_FILES = talloc.o
 PC_FILE = talloc.pc
diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac
index 7878d59300..4719aa04b5 100644
--- a/source4/lib/talloc/configure.ac
+++ b/source4/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT(talloc, 1.1.0)
+AC_INIT(talloc, 1.2.0)
 AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_CONFIG_HEADER(config.h)
diff --git a/source4/lib/talloc/talloc.mk b/source4/lib/talloc/talloc.mk
index 2dc75dd716..590adc74f2 100644
--- a/source4/lib/talloc/talloc.mk
+++ b/source4/lib/talloc/talloc.mk
@@ -1,10 +1,10 @@
-all:: libtalloc.a $(SOLIB) testsuite
-
 TALLOC_OBJ = $(tallocdir)/talloc.o 
 
 SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
 SONAME = libtalloc.$(SHLIBEXT).1
 
+all:: libtalloc.a $(SOLIB) testsuite
+
 testsuite:: $(LIBOBJ) testsuite.o
 	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
 
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 8c79f6e24c..4a95fdb380 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -32,11 +32,13 @@ tdbdir = @tdbdir@
 
 TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@
 
-all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+default: all
 
 include $(tdbdir)/tdb.mk
 include $(tdbdir)/rules.mk
 
+all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+
 install:: all
 $(SOLIB): $(TDB_OBJ)
 	$(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME)
diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk
index fe77a0492d..d0f9815c13 100644
--- a/source4/lib/tdb/tdb.mk
+++ b/source4/lib/tdb/tdb.mk
@@ -25,8 +25,8 @@ bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
 bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
 
-test:: bin/tdbtorture$(EXEEXT)
-	bin/tdbtorture$(EXEEXT)
+test:: bin/tdbtorture$(EXEEXT) $(SONAME)
+	$(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT)
 
 clean:: 
 	rm -f test.db test.tdb torture.tdb test.gdbm
@@ -36,7 +36,7 @@ clean::
 build-python:: _tdb.$(SHLIBEXT) 
 
 tdb_wrap.o: $(tdbdir)/tdb_wrap.c
-	$(CC) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
+	$(CC) $(PICFLAG) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
 
 _tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) tdb_wrap.o
 	$(SHLD) $(SHLD_FLAGS) -o $@ tdb_wrap.o -L. -ltdb `$(PYTHON_CONFIG) --libs`
@@ -66,13 +66,13 @@ installdirs::
 	mkdir -p $(DESTDIR)$(libdir) 
 	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
 
-installbin:: installdirs
+installbin:: all installdirs
 	cp $(PROGS) $(DESTDIR)$(bindir)
 
 installheaders:: installdirs
 	cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
 
-installlibs:: installdirs
+installlibs:: all installdirs
 	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
 	cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir)