summaryrefslogtreecommitdiff
path: root/source4/build/m4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-06 09:52:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:43 -0500
commit6150443532ef714fcd060e4fe384db11552eb673 (patch)
tree3bd1bb7b2e6958946aa42174e383708f96738eb4 /source4/build/m4
parent53a78afe301ebcaec234b8fb97de88e2a5bb6fa3 (diff)
downloadsamba-6150443532ef714fcd060e4fe384db11552eb673.tar.gz
samba-6150443532ef714fcd060e4fe384db11552eb673.tar.bz2
samba-6150443532ef714fcd060e4fe384db11552eb673.zip
r18152: move our AC macros into lib/replace/libreplace_macros.m4
and include them from there metze (This used to be commit 38f9e90a120b4e62f005a1bac89139ee87f63071)
Diffstat (limited to 'source4/build/m4')
-rw-r--r--source4/build/m4/check_cc.m49
-rw-r--r--source4/build/m4/smb_cc_features.m429
2 files changed, 1 insertions, 37 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
index 3999ad349e..4769d5087d 100644
--- a/source4/build/m4/check_cc.m4
+++ b/source4/build/m4/check_cc.m4
@@ -71,17 +71,10 @@ AC_SUBST(samba_cv_immediate_structures)
############################################
# check if the compiler handles c99 struct initialization
-SMB_CC_SUPPORTS_C99_STRUCT_INIT(samba_cv_c99_struct_initialization=yes,
+LIBREPLACE_C99_STRUCT_INIT(samba_cv_c99_struct_initialization=yes,
samba_cv_c99_struct_initialization=no)
if test x"$samba_cv_c99_struct_initialization" != x"yes"; then
- # We might need to add some flags to CC to get c99 behaviour.
- AX_CFLAGS_IRIX_OPTION(-c99, CFLAGS)
- SMB_CC_SUPPORTS_C99_STRUCT_INIT(samba_cv_c99_struct_initialization=yes,
- samba_cv_c99_struct_initialization=no)
-fi
-
-if test x"$samba_cv_c99_struct_initialization" != x"yes"; then
AC_MSG_WARN([C compiler does not support c99 struct initialization!])
AC_MSG_ERROR([Please Install gcc from http://gcc.gnu.org/])
fi
diff --git a/source4/build/m4/smb_cc_features.m4 b/source4/build/m4/smb_cc_features.m4
deleted file mode 100644
index 4044e9615e..0000000000
--- a/source4/build/m4/smb_cc_features.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-dnl SMB Compiler Capability Checks
-dnl -------------------------------------------------------
-dnl Copyright (C) Stefan (metze) Metzmacher 2004,2005
-dnl Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-############################################
-# Check if the compiler handles c99 struct initialization.
-# Usage: SMB_CC_SUPPORTS_C99_STRUCT_INIT(success-action,failure-action)
-
-AC_DEFUN([SMB_CC_SUPPORTS_C99_STRUCT_INIT],
-[
-AC_MSG_CHECKING(for C99 designated initializers)
-AC_TRY_COMPILE([
- #include <stdio.h>],
- [
- struct foo {
- int x;
- char y;
- } ;
- struct foo bar = {
- .y = 'X',
- .x = 1
- };
- ],
-[AC_MSG_RESULT(yes); $1],[AC_MSG_RESULT(no); $2])
-])
-