diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-11-07 10:44:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:04 -0500 |
| commit | 22a155af0568d136a3162fbe45e36993b23d83a3 (patch) | |
| tree | 6d2fcea75dd9768db47874583ff855331b2b2c74 /source4 | |
| parent | 438f14701a5aa980b560623fd4c2f3d340c1cc7c (diff) | |
| download | samba-22a155af0568d136a3162fbe45e36993b23d83a3.tar.gz samba-22a155af0568d136a3162fbe45e36993b23d83a3.tar.bz2 samba-22a155af0568d136a3162fbe45e36993b23d83a3.zip | |
r19609: fix uninitialized perl variabel, we need AC_SUBST() for all configure vars
we want to use in perl...
metze
(This used to be commit 2b021e2d8cff1a097068810d379fc0dca6869654)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/env.pm | 2 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace_cc.m4 | 38 |
2 files changed, 22 insertions, 18 deletions
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm index 1fdaf87ad7..8a34f40ad6 100644 --- a/source4/build/smb_build/env.pm +++ b/source4/build/smb_build/env.pm @@ -59,7 +59,7 @@ sub PkgConfig($$$$$$$$$$) print __FILE__.": creating $path\n"; - if ($self->{config}->{samba_cv_immediate_structures} eq "yes") { + if ($self->{config}->{libreplace_cv_immediate_structures} eq "yes") { $cflags .= " -DHAVE_IMMEDIATE_STRUCTURES=1"; } diff --git a/source4/lib/replace/libreplace_cc.m4 b/source4/lib/replace/libreplace_cc.m4 index b8b74036e5..74c53cad99 100644 --- a/source4/lib/replace/libreplace_cc.m4 +++ b/source4/lib/replace/libreplace_cc.m4 @@ -140,23 +140,27 @@ 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]) +AC_SUBST(libreplace_cv_immediate_structures) +AC_CACHE_CHECK([for immediate structures],libreplace_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} + }; + ], + libreplace_cv_immediate_structures=yes, + libreplace_cv_immediate_structures=no, + libreplace_cv_immediate_structures=cross) +]) +if test x"$libreplace_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 |