summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-02-13 10:14:04 +1100
committerAndrew Tridgell <tridge@samba.org>2008-02-13 10:14:04 +1100
commit7714a91f6762bb8d6578d89a49bfd5672aca054c (patch)
tree60b4d72b94ecb96f95e4d8e7041bf8abe58e8fa8 /source4/lib/ldb
parente94d710b0b959d8e69eb02ef0704ebcff56485fb (diff)
parent3cfac63d165f072464e93a12f7ad48450c66477b (diff)
downloadsamba-7714a91f6762bb8d6578d89a49bfd5672aca054c.tar.gz
samba-7714a91f6762bb8d6578d89a49bfd5672aca054c.tar.bz2
samba-7714a91f6762bb8d6578d89a49bfd5672aca054c.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 11102681bcd70b0abb2df38bcdc7fdec51e71600)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/Makefile.in1
-rw-r--r--source4/lib/ldb/ldb.mk2
2 files changed, 2 insertions, 1 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)