From 4967f6948f479b0b2a3b7a3c05b5709e42207604 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Jan 2009 16:46:52 +0100
Subject: Move check_make.m4 to the top-level.

---
 m4/check_make.m4               | 33 +++++++++++++++++++++++++++++++++
 source3/configure.in           |  2 +-
 source4/build/m4/check_make.m4 | 33 ---------------------------------
 source4/build/m4/env.m4        |  2 +-
 4 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 m4/check_make.m4
 delete mode 100644 source4/build/m4/check_make.m4

diff --git a/m4/check_make.m4 b/m4/check_make.m4
new file mode 100644
index 0000000000..343913f884
--- /dev/null
+++ b/m4/check_make.m4
@@ -0,0 +1,33 @@
+dnl SMB Build Environment make Checks
+dnl -------------------------------------------------------
+dnl  Copyright (C) Stefan (metze) Metzmacher 2004
+dnl  Copyright (C) Jelmer Vernooij 2005
+dnl  Released under the GNU GPL
+dnl -------------------------------------------------------
+dnl
+
+AC_DEFUN([AC_SAMBA_GNU_MAKE],
+[
+AC_PATH_PROGS(MAKE,gmake make)
+
+AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
+then
+	samba_cv_gnu_make=no
+else
+	samba_cv_gnu_make=yes
+fi
+])
+if test x$samba_cv_gnu_make = xyes; then
+	$1
+else
+	$2
+fi
+])
+
+AC_DEFUN([AC_SAMBA_GNU_MAKE_VERSION], 
+[
+AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[
+		samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null`
+	])
+])
diff --git a/source3/configure.in b/source3/configure.in
index fb5e7b377f..de6ad0ee99 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/check_make.m4 b/source4/build/m4/check_make.m4
deleted file mode 100644
index 343913f884..0000000000
--- a/source4/build/m4/check_make.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl SMB Build Environment make Checks
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-dnl  Copyright (C) Jelmer Vernooij 2005
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_DEFUN([AC_SAMBA_GNU_MAKE],
-[
-AC_PATH_PROGS(MAKE,gmake make)
-
-AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
-if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-then
-	samba_cv_gnu_make=no
-else
-	samba_cv_gnu_make=yes
-fi
-])
-if test x$samba_cv_gnu_make = xyes; then
-	$1
-else
-	$2
-fi
-])
-
-AC_DEFUN([AC_SAMBA_GNU_MAKE_VERSION], 
-[
-AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[
-		samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null`
-	])
-])
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 6f582aa35e..ca9f05e16b 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()
-- 
cgit