svn commit: samba r18500 - in branches/SAMBA_4_0/source/build/m4: .

[metze at samba.org]

Author: metze
Date: 2006-09-14 06:22:02 +0000 (Thu, 14 Sep 2006)
New Revision: 18500

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18500

Log:
move make related checks into its own file

metze

Added:
   branches/SAMBA_4_0/source/build/m4/check_make.m4
Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/m4/env.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-09-14 05:33:54 UTC (rev 18499)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-09-14 06:22:02 UTC (rev 18500)
@@ -203,40 +203,3 @@
 AC_SUBST(HOSTCC)
 
 AC_PATH_PROG(GCOV,gcov)
-
-AC_PATH_PROG(MAKE,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=yes
-else
-	samba_cv_gnu_make=no
-fi
-])
-
-GNU_MAKE=$samba_cv_gnu_make
-AC_SUBST(GNU_MAKE)
-
-if test "x$GNU_MAKE" = x"yes"; then
-	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`
-	])
-	GNU_MAKE_VERSION=$samba_cv_gnu_make_version
-	AC_SUBST(GNU_MAKE_VERSION)
-fi
-
-
-new_make=no
-AC_MSG_CHECKING([for GNU make >= 3.81])
-if test x$GNU_MAKE = x"yes"; then
-	if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
-		new_make=yes
-	fi
-fi
-AC_MSG_RESULT($new_make)
-automatic_dependencies=no
-AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])
-AC_MSG_CHECKING([Whether to use automatic dependencies])
-AC_MSG_RESULT($automatic_dependencies)
-AC_SUBST(automatic_dependencies)

Copied: branches/SAMBA_4_0/source/build/m4/check_make.m4 (from rev 18498, branches/SAMBA_4_0/source/build/m4/check_cc.m4)
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-09-14 05:13:20 UTC (rev 18498)
+++ branches/SAMBA_4_0/source/build/m4/check_make.m4	2006-09-14 06:22:02 UTC (rev 18500)
@@ -0,0 +1,43 @@
+dnl SMB Build Environment make Checks
+dnl -------------------------------------------------------
+dnl  Copyright (C) Stefan (metze) Metzmacher 2004
+dnl  Released under the GNU GPL
+dnl -------------------------------------------------------
+dnl
+
+AC_PATH_PROG(MAKE,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=yes
+else
+	samba_cv_gnu_make=no
+fi
+])
+
+GNU_MAKE=$samba_cv_gnu_make
+AC_SUBST(GNU_MAKE)
+
+if test "x$GNU_MAKE" = x"yes"; then
+	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`
+	])
+	GNU_MAKE_VERSION=$samba_cv_gnu_make_version
+	AC_SUBST(GNU_MAKE_VERSION)
+fi
+
+
+new_make=no
+AC_MSG_CHECKING([for GNU make >= 3.81])
+if test x$GNU_MAKE = x"yes"; then
+	if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
+		new_make=yes
+	fi
+fi
+AC_MSG_RESULT($new_make)
+automatic_dependencies=no
+AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])
+AC_MSG_CHECKING([Whether to use automatic dependencies])
+AC_MSG_RESULT($automatic_dependencies)
+AC_SUBST(automatic_dependencies)

Modified: branches/SAMBA_4_0/source/build/m4/env.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/env.m4	2006-09-14 05:33:54 UTC (rev 18499)
+++ branches/SAMBA_4_0/source/build/m4/env.m4	2006-09-14 06:22:02 UTC (rev 18500)
@@ -37,5 +37,6 @@
 m4_include(build/m4/check_perl.m4)
 m4_include(build/m4/check_cc.m4)
 m4_include(build/m4/check_ld.m4)
+m4_include(build/m4/check_make.m4)
 m4_include(build/m4/check_types.m4)
 m4_include(build/m4/check_doc.m4)