diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-10-05 07:45:21 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:11 -0500 |
commit | 6bcb2ea2717f7f80375c7acb847a1e49a45a5902 (patch) | |
tree | 9213e156a753851cbbad0951a30a7e72e68431f1 | |
parent | 11d219f1a11983ebb3f93251088e81a09806dfb7 (diff) | |
download | samba-6bcb2ea2717f7f80375c7acb847a1e49a45a5902.tar.gz samba-6bcb2ea2717f7f80375c7acb847a1e49a45a5902.tar.bz2 samba-6bcb2ea2717f7f80375c7acb847a1e49a45a5902.zip |
r19090: - the LIBREPLACE_C99 isn't needed in aclocal.m4
- including the ldb configure tests via aclocal.m4 is wrong
metze
(This used to be commit cd4b1cf0e7ced553c691ea0e34fd764577d88dce)
-rw-r--r-- | source3/aclocal.m4 | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4 index 5d9a9e054b..b27dc2ec5d 100644 --- a/source3/aclocal.m4 +++ b/source3/aclocal.m4 @@ -764,80 +764,4 @@ int main(void) ]) ]) -############################################ -# 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 -qlanglvl=extc99) - CFLAGS="$saved_CFLAGS -qlanglvl=extc99"; - 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 -qlanglvl=stdc99) - CFLAGS="$saved_CFLAGS -qlanglvl=stdc99"; - 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 "`uname`" = "HP-UX"; then - if test "$ac_cv_c_compiler_gnu" = no; then - # special override for broken HP-UX compiler - I can't find a way to test - # this properly (its a compiler bug) - CFLAGS="$CFLAGS -AC99"; - c99_init=yes; - fi -fi - -if test x"$c99_init" = x"yes"; then - saved_CFLAGS="" - $1 -else - CFLAGS="$saved_CFLAGS" - saved_CFLAGS="" - $2 -fi -]) - m4_include(lib/replace/libreplace.m4) - -dnl not needed yet, might be needed in the future -dnl m4_include(lib/ldb/libldb.m4) |