summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-24 16:16:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:19 -0500
commit62bdececc6de25d1dfdc5c27b5600180d2c8f446 (patch)
tree4209dea40eb7d4b3dc93e52fb56c5efd258e781b
parent763c0a8983cc39435489cca45389e33278e95e5b (diff)
downloadsamba-62bdececc6de25d1dfdc5c27b5600180d2c8f446.tar.gz
samba-62bdececc6de25d1dfdc5c27b5600180d2c8f446.tar.bz2
samba-62bdececc6de25d1dfdc5c27b5600180d2c8f446.zip
r15214: Introduce subsystem-specific CFLAGS to keep the global CFLAGS short.
(This used to be commit a495bc60ab1b233fe507b2b1aa0ad7378cf52677)
-rw-r--r--source4/build/m4/public.m42
-rw-r--r--source4/build/smb_build/output.pm5
-rw-r--r--source4/lib/registry/registry.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 00699acc6e..6e8be7fa5e 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -80,8 +80,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
SMB_EXT_LIB_ENABLE($1, YES)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
- CFLAGS="$OLD_CFLAGS"
AC_MSG_WARN([cannot run when cross-compiling]))
+ CFLAGS="$OLD_CFLAGS"
SMB_EXT_LIB($1,
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 5593558c0c..848286946b 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -169,6 +169,11 @@ sub create_output($$)
}
}
+ foreach $part (values %{$depend}) {
+ $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CFLAGS}}) if defined($part->{CFLAGS});
+ $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS});
+ }
+
return $depend;
}
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index d6b4e5b08c..b556829880 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -36,7 +36,7 @@
#define HKEY_PERFORMANCE_TEXT 0x80000050
#define HKEY_PERFORMANCE_NLSTEXT 0x80000060
-#define REG_DELETE -1
+#define REG_DELETE -1
/*
* The general idea here is that every backend provides a 'hive'. Combining