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

[metze at samba.org]

Author: metze
Date: 2006-09-06 08:27:07 +0000 (Wed, 06 Sep 2006)
New Revision: 18144

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

Log:
make the logic a bit more cut&paste friendly

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/cc_features.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/cc_features.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/cc_features.m4	2006-09-06 07:11:09 UTC (rev 18143)
+++ branches/SAMBA_4_0/source/lib/replace/cc_features.m4	2006-09-06 08:27:07 UTC (rev 18144)
@@ -8,26 +8,30 @@
 
 ############################################
 # Check if the compiler handles c99 struct initialization, and if not try -AC99 and -c99 flags
-# Usage: LIBREPLACE_CC_SUPPORTS_C99_STRUCT_INIT(success-action,failure-action)
+# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
 # changes CFLAGS to add -AC99 or -c99 if needed
 
 AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
 [
-AC_MSG_CHECKING(for C99 designated initializers)
 saved_CFLAGS="$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; $1], [c99_init=no; AC_MSG_RESULT(no)])
+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; $1],[AC_MSG_RESULT(no)])
+     [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)
@@ -36,7 +40,14 @@
      [ struct foo {int x;char y;};
        struct foo bar = { .y = 'X', .x = 1 };	 
      ],
-     [AC_MSG_RESULT(yes); $1],[AC_MSG_RESULT(no);CFLAGS="$saved_CFLAGS"; $2])
+     [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
 ])
-