diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 23:25:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 23:25:12 +0200 |
| commit | ecca199486a30957e7f0dc084d0e21eb3c812c15 (patch) | |
| tree | ed264f6920c71356edcc40820a0011138c4f863e | |
| parent | ecc108ccb0e8dde06791f207cebd53f17cd06e55 (diff) | |
| download | samba-ecca199486a30957e7f0dc084d0e21eb3c812c15.tar.gz samba-ecca199486a30957e7f0dc084d0e21eb3c812c15.tar.bz2 samba-ecca199486a30957e7f0dc084d0e21eb3c812c15.zip | |
Fix merged build .
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/lib/ldb/libldb.m4 | 32 | ||||
| -rw-r--r-- | source3/samba4.m4 | 20 | ||||
| -rw-r--r-- | source4/build/m4/env.m4 | 1 |
4 files changed, 21 insertions, 34 deletions
diff --git a/source3/configure.in b/source3/configure.in index 7d05b63122..443cdd6161 100644 --- 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 845563b4a1..df2075d4e3 100644 --- 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 1bd9c38c29..a5b7da7e07 100644 --- 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 360ce17a1c..4cde95d5e7 100644 --- 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([ |