Disable CFLAGS hack when include path starts with variable.

(This used to be commit 86ce8bf88acf3f9f9966ccf063bbf46d134ea4ba)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0269cfe8a346712698c34f32cf29bbb501b153bf..e93e3eb767a7c36c55cc229ef29522d95b00ad25 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -262,6 +262,7 @@ sub CFlags($$)
                if($src_ne_build) {
                        if($flag =~ m#^-I([^/].*$)#) {
                                my $dir = $1;
                if($src_ne_build) {
                        if($flag =~ m#^-I([^/].*$)#) {
                                my $dir = $1;

+                               next if ($dir =~ /^\$\(/);

                                $dir =~ s#^\$\((?:src|build)dir\)/?##;
                                push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
                                next;
                                $dir =~ s#^\$\((?:src|build)dir\)/?##;
                                push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
                                next;