summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-16 12:08:33 +0200
committerGünther Deschner <gd@samba.org>2010-08-16 12:23:08 +0200
commitf24c99fba05ee24232f8047a11f09a093da7b266 (patch)
treef523dc6df7e46511174f3c211b82178348fd4536 /source3
parentb0b73ca041ba3d90b3924b380abed4975e5354d9 (diff)
downloadsamba-f24c99fba05ee24232f8047a11f09a093da7b266.tar.gz
samba-f24c99fba05ee24232f8047a11f09a093da7b266.tar.bz2
samba-f24c99fba05ee24232f8047a11f09a093da7b266.zip
s3-build: always check for python.
This should fix make test. Metze, please check. Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index b4564eec08..627ec7f234 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -210,6 +210,10 @@ AC_SAMBA_GNU_MAKE([true], [true])
m4_include(../m4/check_perl.m4)
AC_SAMBA_PERL([true], [merged_build_possible=no])
+# Check for python
+m4_include(../m4/check_python.m4)
+AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
+
AC_CHECK_TOOL(AR, ar)
dnl Check if we (actually our C compiler!) use GNU ld
@@ -6834,9 +6838,6 @@ fi
m4_include(../lib/zlib/zlib.m4)
if test x$enable_merged_build = xauto; then
- # Check for python
- m4_include(../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])