summaryrefslogtreecommitdiff
path: root/source4/build
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 /source4/build
parent4977d913ed54935383155f7b2045fd6679bacc33 (diff)
downloadsamba-4967f6948f479b0b2a3b7a3c05b5709e42207604.tar.gz
Move check_make.m4 to the top-level.
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/m4/check_make.m433
-rw-r--r--source4/build/m4/env.m42
2 files changed, 1 insertions, 34 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4
deleted file mode 100644
index 343913f8846..00000000000
--- 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 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()