From f24c99fba05ee24232f8047a11f09a093da7b266 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 16 Aug 2010 12:08:33 +0200 Subject: s3-build: always check for python. This should fix make test. Metze, please check. Guenther --- source3/configure.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3') 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]) -- cgit