summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-21 16:46:52 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-21 16:46:52 +0100
commit4967f6948f479b0b2a3b7a3c05b5709e42207604 (patch)
tree1e5ca89e940e3c3fdf2efa0010cb345bb37b3868
parent4977d913ed54935383155f7b2045fd6679bacc33 (diff)
downloadsamba-4967f6948f479b0b2a3b7a3c05b5709e42207604.tar.gz
samba-4967f6948f479b0b2a3b7a3c05b5709e42207604.tar.bz2
samba-4967f6948f479b0b2a3b7a3c05b5709e42207604.zip
Move check_make.m4 to the top-level.
-rw-r--r--m4/check_make.m4 (renamed from source4/build/m4/check_make.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_make.m4 b/m4/check_make.m4
index 343913f884..343913f884 100644
--- a/source4/build/m4/check_make.m4
+++ b/m4/check_make.m4
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/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()