summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/env.m4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-06-01 15:56:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:24 -0500
commitc6dfa0cc3dee62374bc1e5d6554fbcd1a8891a64 (patch)
tree755ed5c9bc89fbafa628e462a4b53e595495e9b3 /source4/build/smb_build/env.m4
parent9318fdbb3346da0374ab859055ea399dff86a861 (diff)
downloadsamba-c6dfa0cc3dee62374bc1e5d6554fbcd1a8891a64.tar.gz
samba-c6dfa0cc3dee62374bc1e5d6554fbcd1a8891a64.tar.bz2
samba-c6dfa0cc3dee62374bc1e5d6554fbcd1a8891a64.zip
r968: use sinlcude() and no function, that's more portable between
autoconf versions metze (This used to be commit 9fa83ca022f2ca2e9e5d3d738beefcf9f90cfcff)
Diffstat (limited to 'source4/build/smb_build/env.m4')
-rw-r--r--source4/build/smb_build/env.m442
1 files changed, 9 insertions, 33 deletions
diff --git a/source4/build/smb_build/env.m4 b/source4/build/smb_build/env.m4
index ef9aa5e514..ec2b18a6ba 100644
--- a/source4/build/smb_build/env.m4
+++ b/source4/build/smb_build/env.m4
@@ -4,39 +4,15 @@ dnl Copyright (C) Stefan (metze) Metzmacher 2004
dnl Released under the GNU GPL
dnl -------------------------------------------------------
dnl
-dnl _SMB_BUILD_ENV(
-dnl 1:dummy
-dnl )
-dnl #######################################################
-dnl ### And now the implementation ###
-dnl #######################################################
+SMB_VERSION_STRING=`cat include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
+echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
-dnl _SMB_BUILD_ENV(
-dnl 1:dummy
-dnl )
-AC_DEFUN([_SMB_BUILD_ENV],
-[
- SMB_VERSION_STRING=`cat include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
- echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
+AC_VALIDATE_CACHE_SYSTEM_TYPE
- _SMB_BUILD_CHECK_PATH([])
-
- _SMB_BUILD_CHECK_PERL([])
-
- _SMB_BUILD_CHECK_CC([])
-
- _SMB_BUILD_CHECK_LD([])
-
- _SMB_BUILD_CHECK_SHLD([])
-
- AC_CANONICAL_BUILD
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
-
- AC_VALIDATE_CACHE_SYSTEM_TYPE
-
- _SMB_BUILD_CHECK_TYPES([])
-
- AC_PROG_INSTALL
-])
+sinclude(build/smb_build/check_path.m4)
+sinclude(build/smb_build/check_perl.m4)
+sinclude(build/smb_build/check_cc.m4)
+sinclude(build/smb_build/check_ld.m4)
+sinclude(build/smb_build/check_shld.m4)
+sinclude(build/smb_build/check_types.m4)