svn commit: samba r18281 - in branches/SAMBA_4_0/source: lib/smbreadline script

[tridge at samba.org]

Author: tridge
Date: 2006-09-09 02:32:12 +0000 (Sat, 09 Sep 2006)
New Revision: 18281

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18281

Log:

a workaround for an infinite dependency loop in the dependency
generation for smbreadline.d. The problem was caused by
extra_flags.txt having ./lib/smbreadline/smbreadline.o but the build
using lib/smbreadline/smbreadline.o, which means cflags.pl didn't
match the target. 

Hopefully the workaround can be removed when metze or jelmer wake up
and give me a hint on how to make SMB_SUBSYSTEM() not add the ./
prefix :-)

Modified:
   branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c
   branches/SAMBA_4_0/source/script/cflags.pl


Changeset:
Modified: branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c	2006-09-09 02:12:09 UTC (rev 18280)
+++ branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c	2006-09-09 02:32:12 UTC (rev 18281)
@@ -21,9 +21,9 @@
 
 #include "includes.h"
 #include "pstring.h"
-#include "lib/replace/system/filesys.h"
-#include "lib/replace/system/select.h"
-#include "lib/replace/system/readline.h"
+#include "system/filesys.h"
+#include "system/select.h"
+#include "system/readline.h"
 
 /*******************************************************************
  Similar to sys_select() but catch EINTR and continue.

Modified: branches/SAMBA_4_0/source/script/cflags.pl
===================================================================
--- branches/SAMBA_4_0/source/script/cflags.pl	2006-09-09 02:12:09 UTC (rev 18280)
+++ branches/SAMBA_4_0/source/script/cflags.pl	2006-09-09 02:32:12 UTC (rev 18281)
@@ -7,13 +7,15 @@
 use strict;
 
 my $target = shift;
+my $target2 = "./$target";
 
 sub check_flags($)
 {
     my ($name)=@_;
 	open (IN, "extra_cflags.txt");
     while (<IN> =~ /^([^:]+): (.*)$/) {
-		next unless (grep(/^$target$/, (split / /, $1)));
+		next unless (grep(/^$target$/, (split / /, $1)) ||
+			     grep(/^$target2$/, (split / /, $1)));
 		$_ = $2;
 		s/^CFLAGS\+=//;
 		print "$_ ";