summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-21 14:36:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:02 -0500
commit4fd82be1403f873f67eecb8fee457b8de9fc5cd1 (patch)
treeddef9ca4fabc636c0b3e5e29635b40b38a9dab60
parent3434cd778c975eb1bb29d257770bd6dbb2335ce9 (diff)
downloadsamba-4fd82be1403f873f67eecb8fee457b8de9fc5cd1.tar.gz
samba-4fd82be1403f873f67eecb8fee457b8de9fc5cd1.tar.bz2
samba-4fd82be1403f873f67eecb8fee457b8de9fc5cd1.zip
r14621: Define HAVE_IMMEDIATE_STRUCTURES for those using Samba headers,
so people don't end up with different sizes for NTSTATUS... (This used to be commit 54962ce41a7ae72d1dc8cbb2d2cf9cd60a1ed683)
-rw-r--r--source4/build/m4/check_cc.m41
-rw-r--r--source4/build/smb_build/env.pm4
2 files changed, 5 insertions, 0 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
index 277afc18c6..99e6bd5d23 100644
--- a/source4/build/m4/check_cc.m4
+++ b/source4/build/m4/check_cc.m4
@@ -65,6 +65,7 @@ AC_CACHE_CHECK([for immediate structures],samba_cv_immediate_structures, [
if test x"$samba_cv_immediate_structures" = x"yes"; then
AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
fi
+AC_SUBST(samba_cv_immediate_structures)
############################################
# check if the compiler handles c99 struct initialization
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm
index 184d094d2d..7ff6627494 100644
--- a/source4/build/smb_build/env.pm
+++ b/source4/build/smb_build/env.pm
@@ -57,6 +57,10 @@ sub PkgConfig($$$$$$$$)
print __FILE__.": creating $path\n";
+ if ($self->{config}->{samba_cv_immediate_structures} eq "yes") {
+ $cflags .= " -DHAVE_IMMEDIATE_STRUCTURES=1";
+ }
+
open(OUT, ">$path") or die("Can't open $path: $!");
print OUT <<"__EOF__";