svn commit: samba r18145 - in branches/SAMBA_4_0/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2006-09-06 08:30:56 +0000 (Wed, 06 Sep 2006)
New Revision: 18145

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

Log:
rename cc_feature.m4 into libreplace_macros.m4

metze
Added:
   branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4
Removed:
   branches/SAMBA_4_0/source/lib/replace/cc_features.m4
Modified:
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4


Changeset:
Deleted: branches/SAMBA_4_0/source/lib/replace/cc_features.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/cc_features.m4	2006-09-06 08:27:07 UTC (rev 18144)
+++ branches/SAMBA_4_0/source/lib/replace/cc_features.m4	2006-09-06 08:30:56 UTC (rev 18145)
@@ -1,53 +0,0 @@
-dnl C99 compiler check
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004,2005
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-dnl adapted for libreplace by Andrew Tridgell
-
-############################################
-# Check if the compiler handles c99 struct initialization, and if not try -AC99 and -c99 flags
-# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
-# changes CFLAGS to add -AC99 or -c99 if needed
-
-AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
-[
-saved_CFLAGS="$CFLAGS";
-c99_init=no
-if test x"$c99_init" = x"no"; then
-    AC_MSG_CHECKING(for C99 designated initializers)
-    CFLAGS="$saved_CFLAGS";
-    AC_TRY_COMPILE([#include <stdio.h>],
-     [ struct foo {int x;char y;};
-       struct foo bar = { .y = 'X', .x = 1 };	 
-     ],
-     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x"$c99_init" = x"no"; then
-    AC_MSG_CHECKING(for C99 designated initializers with -AC99)
-    CFLAGS="$saved_CFLAGS -AC99";
-    AC_TRY_COMPILE([#include <stdio.h>],
-     [ struct foo {int x;char y;};
-       struct foo bar = { .y = 'X', .x = 1 };	 
-     ],
-     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x"$c99_init" = x"no"; then
-    AC_MSG_CHECKING(for C99 designated initializers with -c99)
-    CFLAGS="$saved_CFLAGS -c99"
-    AC_TRY_COMPILE([#include <stdio.h>],
-     [ struct foo {int x;char y;};
-       struct foo bar = { .y = 'X', .x = 1 };	 
-     ],
-     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x"$c99_init" = x"yes"; then
-    saved_CFLAGS=""
-    $1
-else
-    CFLAGS="$saved_CFLAGS"
-    saved_CFLAGS=""
-    $2
-fi
-])

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-06 08:27:07 UTC (rev 18144)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-06 08:30:56 UTC (rev 18145)
@@ -167,7 +167,7 @@
 			   [AC_MSG_ERROR([Required function not found])])
 
 m4_include(getpass.m4)
-m4_include(cc_features.m4)
+m4_include(libreplace_macros.m4)
 m4_include(system/config.m4)
 
 LIBREPLACE_C99_STRUCT_INIT(c99_struct_initialization=yes,

Copied: branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 (from rev 18144, branches/SAMBA_4_0/source/lib/replace/cc_features.m4)