r15214: Introduce subsystem-specific CFLAGS to keep the global CFLAGS short.

(This used to be commit a495bc60ab1b233fe507b2b1aa0ad7378cf52677)

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 00699acc6e7e16ce97084f6848d28931f5edc5ff..6e8be7fa5e25e8e18f8a096a0902545e014cd87f 100644 (file)
--- 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 5593558c0cacbadee475416fefeb240a6e33698d..848286946b9fde1d8ed356c72cf1f723c22bb35c 100644 (file)
--- 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 d6b4e5b08c3f9fb1f539bd2c89c227e481b8c6f4..b556829880b0de83a67f635ed3e73ccc27d5dc19 100644 (file)
--- 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