summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-21 18:07:41 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-21 18:07:41 +0100
commitf607ad2e9013bc52d409faf8e628b8c6092f7d61 (patch)
treec23f31afce5f81487772a5078b431e3fd0d63066
parent076bb89028ea4d27a96492b2030d873b0d78ca24 (diff)
downloadsamba-f607ad2e9013bc52d409faf8e628b8c6092f7d61.tar.gz
samba-f607ad2e9013bc52d409faf8e628b8c6092f7d61.tar.bz2
samba-f607ad2e9013bc52d409faf8e628b8c6092f7d61.zip
Move check_python.m4 to common m4 directory.
-rw-r--r--m4/check_python.m4 (renamed from source4/build/m4/check_python.m4)0
-rw-r--r--source3/configure.in2
-rw-r--r--source4/build/m4/env.m42
3 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/m4/check_python.m4 b/m4/check_python.m4
index 7e56af76f7..7e56af76f7 100644
--- a/source4/build/m4/check_python.m4
+++ b/m4/check_python.m4
diff --git a/source3/configure.in b/source3/configure.in
index f1004778f4..87b4c33417 100644
--- 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 a988dd0f58..738ab8b1ae 100644
--- 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])