summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-15 00:15:34 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-15 00:15:34 +0200
commit75dabe874c0cf8893dd61f547d0c3878d411a433 (patch)
tree345db786efab8ad51a7a2181610c1cc22693fe34 /source3
parent91437ea7bc6f74729ec40b5b1eeea57287dd85c4 (diff)
parentecca199486a30957e7f0dc084d0e21eb3c812c15 (diff)
downloadsamba-75dabe874c0cf8893dd61f547d0c3878d411a433.tar.gz
samba-75dabe874c0cf8893dd61f547d0c3878d411a433.tar.bz2
samba-75dabe874c0cf8893dd61f547d0c3878d411a433.zip
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/configure.in24
-rw-r--r--source3/lib/ldb/libldb.m432
-rw-r--r--source3/samba4.m423
-rwxr-xr-xsource3/script/build_idl.sh6
5 files changed, 48 insertions, 39 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1378f64edc..d9ff8593f4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1199,10 +1199,10 @@ samba3-idl::
epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
nbt.idl" \
+ IDL_PATH="librpc/idl" \
CPP="$(CPP)" PIDL="../pidl/pidl" \
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
-
#####################################################################
diff --git a/source3/configure.in b/source3/configure.in
index 1eba4a0a58..443cdd6161 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6219,7 +6219,29 @@ MSG
fi
AC_ARG_ENABLE(merged-build,
-[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
+[ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
+
+if test x$enable_merged_build = xauto; then
+ merged_build_possible=yes
+
+ # Check for GNU make
+ m4_include(../source4/build/m4/check_make.m4)
+ AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
+
+ # Check for perl
+ m4_include(../source4/build/m4/check_perl.m4)
+ AC_SAMBA_PERL([true], [merged_build_possible=no])
+
+ # Check for python
+ m4_include(../source4/build/m4/check_python.m4)
+ AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
+
+ AC_MSG_CHECKING([whether it would be possible to do a merged build])
+ AC_MSG_RESULT([$merged_build_possible])
+
+ dnl FIXME: enable_merged_build=$merged_build_possible
+fi
if test x$enable_merged_build = xyes; then
MERGED_BUILD=1
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 9cf01507de..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)
@@ -21,7 +41,7 @@ m4_include(lib/zlib.m4)
AC_CONFIG_FILES(../source4/lib/registry/registry.pc)
AC_CONFIG_FILES(../source4/librpc/dcerpc.pc)
-AC_CONFIG_FILES(../source4/librpc/ndr.pc)
+AC_CONFIG_FILES(../librpc/ndr.pc)
AC_CONFIG_FILES(../source4/lib/torture/torture.pc)
AC_CONFIG_FILES(../source4/auth/gensec/gensec.pc)
AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc)
@@ -87,7 +107,6 @@ eventsdir="../source4/lib/events"
m4_include(lib/events/libevents.m4)
dnl m4_include(auth/kerberos/config.m4)
-m4_include(scripting/python/config.m4)
m4_include(auth/gensec/config.m4)
m4_include(smbd/process_model.m4)
m4_include(ntvfs/posix/config.m4)
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 2027fd3937..75f8612957 100755
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -20,11 +20,11 @@ for f in ${IDL_FILES}; do
ndr="librpc/gen_ndr/ndr_$basename.c"
if [ -f $ndr ]; then
- if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then
- list="$list librpc/idl/$f"
+ if [ "x`find ${IDL_PATH}/$f -newer $ndr -print`" = "x${IDL_PATH}/$f" ]; then
+ list="$list ${IDL_PATH}/$f"
fi
else
- list="$list librpc/idl/$f"
+ list="$list ${IDL_PATH}/$f"
fi
done