diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-24 02:29:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:01:06 -0500 |
| commit | 64d4ff5dcc24d8dfd104b340816d2c89b7735a85 (patch) | |
| tree | e291b5a202c0012e903fb5fc03442c0a5e2194c3 /source3/lib/replace/libreplace_cc.m4 | |
| parent | af4f43db8d8d2b79d04f33e513555bdb72e265f6 (diff) | |
| download | samba-64d4ff5dcc24d8dfd104b340816d2c89b7735a85.tar.gz | |
r18864: merge lib/replace changes from samba4
(This used to be commit 6d5f507136be327558e98214b64eca225ca23d66)
Diffstat (limited to 'source3/lib/replace/libreplace_cc.m4')
| -rw-r--r-- | source3/lib/replace/libreplace_cc.m4 | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/source3/lib/replace/libreplace_cc.m4 b/source3/lib/replace/libreplace_cc.m4 index aa0465983af..352d1155473 100644 --- a/source3/lib/replace/libreplace_cc.m4 +++ b/source3/lib/replace/libreplace_cc.m4 @@ -28,7 +28,13 @@ ac_cv_prog_cc_Ae=no savedCFLAGS=$CFLAGS AC_PROG_CC CFLAGS=$savedCFLAGS + +dnl don't try for C99 if we are using gcc, as otherwise we +dnl lose immediate structure constants +if test x"$GCC" = x"no" ; then AC_PROG_CC_C99 +fi + if test x"$GCC" = x"yes" ; then AC_MSG_CHECKING([for version of gcc]) GCC_VERSION=`$CC -dumpversion` @@ -122,5 +128,26 @@ if test $ac_cv_sizeof_long_long -lt 8;then AC_MSG_ERROR([LIBREPLACE needs sizeof(long long) >= 8]) fi +############################################ +# check if the compiler can do immediate structures +AC_CACHE_CHECK([for immediate structures],samba_cv_immediate_structures, [ + AC_TRY_COMPILE([ +#include <stdio.h>], +[ + typedef struct {unsigned x;} FOOBAR; + #define X_FOOBAR(x) ((FOOBAR) { x }) + #define FOO_ONE X_FOOBAR(1) + FOOBAR f = FOO_ONE; + static const struct { + FOOBAR y; + } f2[] = { + {FOO_ONE} + }; +], + samba_cv_immediate_structures=yes,samba_cv_immediate_structures=no)]) +if test x"$samba_cv_immediate_structures" = x"yes"; then + AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures]) +fi + AC__LIBREPLACE_ONLY_CC_CHECKS_END ]) dnl end AC_LIBREPLACE_CC_CHECKS |