From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Jan 2009 15:46:52 +0000 (+0100)
Subject: Move check_make.m4 to the top-level.
X-Git-Tag: samba-4.0.0alpha7~443
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4967f6948f479b0b2a3b7a3c05b5709e42207604;p=thirdparty%2Fsamba.git

Move check_make.m4 to the top-level.
---

diff --git a/source4/build/m4/check_make.m4 b/m4/check_make.m4
similarity index 100%
rename from source4/build/m4/check_make.m4
rename to m4/check_make.m4
diff --git a/source3/configure.in b/source3/configure.in
index fb5e7b377ff..de6ad0ee99d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6281,7 +6281,7 @@ if test x$enable_merged_build = xauto; then
 	merged_build_possible=yes
 
 	# Check for GNU make
-	m4_include(../source4/build/m4/check_make.m4)
+	m4_include(../source4/m4/check_make.m4)
 	AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
 
 	# Check for perl
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 6f582aa35ee..ca9f05e16b0 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -48,7 +48,7 @@ AC_PATH_PROG(YAPP, yapp, false)
 
 m4_include(build/m4/check_cc.m4)
 m4_include(build/m4/check_ld.m4)
-m4_include(build/m4/check_make.m4)
+m4_include(../m4/check_make.m4)
 
 AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])])
 AC_SAMBA_GNU_MAKE_VERSION()