svn commit: samba r15214 - in branches/SAMBA_4_0/source: build/m4
build/smb_build lib/registry
jelmer at samba.org
jelmer at samba.org
Mon Apr 24 16:16:43 GMT 2006
Author: jelmer
Date: 2006-04-24 16:16:43 +0000 (Mon, 24 Apr 2006)
New Revision: 15214
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15214
Log:
Introduce subsystem-specific CFLAGS to keep the global CFLAGS short.
Modified:
branches/SAMBA_4_0/source/build/m4/public.m4
branches/SAMBA_4_0/source/build/smb_build/output.pm
branches/SAMBA_4_0/source/lib/registry/registry.h
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/public.m4 2006-04-24 16:15:29 UTC (rev 15213)
+++ branches/SAMBA_4_0/source/build/m4/public.m4 2006-04-24 16:16:43 UTC (rev 15214)
@@ -80,8 +80,8 @@
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,
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-24 16:15:29 UTC (rev 15213)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-24 16:16:43 UTC (rev 15214)
@@ -169,6 +169,11 @@
}
}
+ 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;
}
Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/registry.h 2006-04-24 16:15:29 UTC (rev 15213)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h 2006-04-24 16:16:43 UTC (rev 15214)
@@ -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
More information about the samba-cvs
mailing list