Move check_python.m4 to common m4 directory.

diff --git a/source4/build/m4/check_python.m4 b/m4/check_python.m4
similarity index 100%
rename from source4/build/m4/check_python.m4
rename to m4/check_python.m4

diff --git a/source3/configure.in b/source3/configure.in
index f1004778f4086b7ac204d761aa4e379e1ebdc06b..87b4c33417c47000cac71e16a6b8d16bd9b8d5f1 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6286,7 +6286,7 @@ m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then
        # Check for python
-       m4_include(../source4/build/m4/check_python.m4)
+       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])

diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index a988dd0f58d0f4fd7c4dc48b392384e92254a82d..738ab8b1aec636f88f9dbdb0422a1b2565a9d5af 100644 (file)
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -73,7 +73,7 @@ AC_SUBST(automatic_dependencies)
 
 m4_include(build/m4/check_doc.m4)
 
-m4_include(build/m4/check_python.m4)
+m4_include(../m4/check_python.m4)
 
 AC_SAMBA_PYTHON_DEVEL([
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])