lib/tdb: sync build system changes and python code from samba4

[metze/samba/wip.git] / source3 / lib / tdb / configure.ac

diff --git a/source3/lib/tdb/configure.ac b/source3/lib/tdb/configure.ac
index 14761bcc1a5a8be381da776ddc32ac761f3748dc..eaf70d30b4470f757a5366e4de7fcb63264f13dd 100644 (file)
--- a/source3/lib/tdb/configure.ac
+++ b/source3/lib/tdb/configure.ac
@@ -2,13 +2,29 @@ AC_PREREQ(2.50)
 AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(tdb, 1.1.1)
+AC_INIT(tdb, 1.1.2)
 AC_CONFIG_SRCDIR([common/tdb.c])
 AC_CONFIG_HEADER(include/config.h)
 AC_LIBREPLACE_ALL_CHECKS
 AC_LD_SONAMEFLAG
 AC_LD_PICFLAG
 AC_LD_SHLIBEXT
+AC_LIBREPLACE_SHLD
 AC_LIBREPLACE_SHLD_FLAGS
+AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
 m4_include(libtdb.m4)
+AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
+AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
+
+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_INSTALL_TARGET=""
+       PYTHON_CHECK_TARGET=""
+fi
 AC_OUTPUT(Makefile tdb.pc)