mirror of
https://github.com/samba-team/samba.git
synced 2025-08-24 21:49:29 +03:00
r19090: - the LIBREPLACE_C99 isn't needed in aclocal.m4
- including the ldb configure tests via aclocal.m4 is wrong metze
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
c7788f6c71
commit
cd4b1cf0e7
76
source/aclocal.m4
vendored
76
source/aclocal.m4
vendored
@ -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)
|
||||
|
Reference in New Issue
Block a user