From aa2fd8ee50d8e416a503fb920f0195cd89c4c93b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 12 Feb 2008 00:49:36 +0100
Subject: [PATCH] Manually compile python files rather than use setup.py. (This
 used to be commit 056843a5c2ca9e0ec59fd7e371852ecb5362ee32)

---
 source4/lib/ldb/Makefile.in  |  3 ++-
 source4/lib/ldb/configure.ac |  3 +++
 source4/lib/ldb/ldb.mk       | 16 ++++++++++------
 source4/lib/ldb/setup.py     | 15 ---------------
 4 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100755 source4/lib/ldb/setup.py

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 738ffe1adbc..d3e027425b5 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_CONFIG = @PYTHON_CONFIG@
 tdbdir = @tdbdir@
 ldbdir = $(srcdir)
 tallocdir = @tallocdir@
@@ -121,7 +122,7 @@ distclean:: clean
 realdistclean:: distclean
 	rm -f configure.in include/config.h.in
 
-check:: test
+check:: test @PYTHON_CHECK_TARGET@
 
 check-soloading: sample_module.$(SHLIBEXT)
 	LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac
index 176cef0f3e0..1435536373d 100644
--- a/source4/lib/ldb/configure.ac
+++ b/source4/lib/ldb/configure.ac
@@ -81,11 +81,14 @@ AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-conf
 
 PYTHON_BUILD_TARGET="build-python"
 PYTHON_INSTALL_TARGET="install-python"
+PYTHON_CHECK_TARGET="check-python"
 AC_SUBST(PYTHON_BUILD_TARGET)
 AC_SUBST(PYTHON_INSTALL_TARGET)
+AC_SUBST(PYTHON_CHECK_TARGET)
 
 if test -z "$PYTHON_CONFIG"; then
 	PYTHON_BUILD_TARGET=""	
+	PYTHON_CHECK_TARGET=""
 	PYTHON_INSTALL_TARGET=""	
 fi
 
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index b9aa24b276d..69c1bf6ad90 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -65,8 +65,13 @@ examples/ldifreader: examples/ldifreader.o $(LIBS)
 	$(CC) -o examples/ldifreader examples/ldifreader.o $(LIB_FLAGS)
 
 # Python bindings
-build-python:: lib/libldb.$(SHLIBEXT) ldb_wrap.c
-	$(ldbdir)/setup.py build
+build-python:: _ldb.$(SHLIBEXT)
+
+ldb_wrap.o: $(ldbdir)/ldb_wrap.c
+	$(CC) -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)
 
 install-python:: build-python
 	$(ldbdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
@@ -75,8 +80,7 @@ install-swig::
 	cp ldb.i `$(SWIG) -swiglib`
 
 check-python:: build-python
-	# FIXME: This isn't portable
-	LD_LIBRARY_PATH=lib PYTHONPATH=.:build/lib.linux-i686-2.4/ trial tests/python/api.py
+	LD_LIBRARY_PATH=lib PYTHONPATH=.:$(ldbdir) trial $(ldbdir)/tests/python/api.py
 
-clean-python::
-	$(ldbdir)/setup.py clean
+clean::
+	rm -f _ldb.$(SHLIBEXT)
diff --git a/source4/lib/ldb/setup.py b/source4/lib/ldb/setup.py
deleted file mode 100755
index b04f3b09f14..00000000000
--- a/source4/lib/ldb/setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-from distutils.core import setup
-from distutils.extension import Extension
-
-setup(name="ldb",
-      version="1.0",
-      url="http://ldb.samba.org/",
-      author="LDB Developers",
-      author_email="ldb@samba.org",
-      license="LGPLv3",
-      keywords=["ldap","ldb","db","ldif"],
-      py_modules=["ldb"],
-      ext_modules=[Extension('_ldb', ['ldb_wrap.c'], include_dirs=['include'],
-                             library_dirs=["lib"], libraries=['ldb'])],
-      )
-- 
2.34.1