Fix merged build .

diff --git a/source3/configure.in b/source3/configure.in
index 7d05b631228ab545124af45c0f9fd9507f7f3276..443cdd61619fadacdc1e6d9b5d9e534fcba412a7 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6220,7 +6220,7 @@ fi
 
 AC_ARG_ENABLE(merged-build, 
 [AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])], 
-[], [ enable_merged_build=auto ])
+[ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
 
 if test x$enable_merged_build = xauto; then
        merged_build_possible=yes

diff --git a/source3/lib/ldb/libldb.m4 b/source3/lib/ldb/libldb.m4
index 845563b4a185e70aa37ddd8f4f6e112e5c3eb417..df2075d4e38271cdf881050b0a3a2fc721560b1a 100644 (file)
--- a/source3/lib/ldb/libldb.m4
+++ b/source3/lib/ldb/libldb.m4
@@ -1,33 +1 @@
 SMB_ENABLE(ldb_sqlite3,$with_sqlite3_support)
-
-AC_MSG_CHECKING([for Python])
-
-PYTHON=
- 
-AC_ARG_WITH(python,
-[  --with-python=PYTHONNAME  build Python libraries],
-[ case "${withval-python}" in
-  yes)
-        PYTHON=python
-        ;;
-  no)
-        PYTHON=
-        ;;
-  *)
-        PYTHON=${withval-python}
-        ;;
-  esac ])
-
-if test x"$PYTHON" != "x"; then
-       incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
-       CPPFLAGS="$CPPFLAGS -I $incdir"
-fi
-
-if test x"$PYTHON" != "x"; then
-       AC_MSG_RESULT([${withval-python}])
-else
-       AC_MSG_RESULT(no)
-       SMB_ENABLE(swig_ldb, NO)
-fi
-
-AC_SUBST(PYTHON)

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 1bd9c38c29d8a3d957cfaf16066d25ded729b12c..a5b7da7e0716ff1dd5aaf7c1f6ae031b7e3f4ddf 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -3,6 +3,26 @@ AC_SUBST(BLDSHARED)
 smbtorture4_path=bin/smbtorture4
 m4_include(build/m4/public.m4)
 
+m4_include(build/m4/check_python.m4)
+
+m4_include(build/m4/ac_pkg_swig.m4)
+
+AC_PROG_SWIG(1.3.36)
+
+AC_SAMBA_PYTHON_DEVEL([
+SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
+SMB_ENABLE(EXT_LIB_PYTHON,YES)
+SMB_ENABLE(LIBPYTHON,YES)
+],[
+AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
+])
+
+AC_MSG_CHECKING(python library directory)
+pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
+AC_MSG_RESULT($pythondir)
+
+AC_SUBST(pythondir)
+
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/internal.m4)
 m4_include(../lib/util/fault.m4)

diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 360ce17a1c6ee526d23d1ae20c027b366e2c786d..4cde95d5e7a308be8f712d44c044e79ef601d44a 100644 (file)
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -77,7 +77,6 @@ m4_include(build/m4/check_python.m4)
 
 m4_include(build/m4/ac_pkg_swig.m4)
 
-
 AC_PROG_SWIG(1.3.36)
 
 AC_SAMBA_PYTHON_DEVEL([