From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 14:45:10 +0000 (+0200)
Subject: Merge branch 'singlereplace' into single
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=bf21371c098684ccad427a54ac76766c0021bc88

Merge branch 'singlereplace' into single

Conflicts:
	source4/configure.ac
	source4/torture/local/config.mk
---

bf21371c098684ccad427a54ac76766c0021bc88
diff --cc source4/configure.ac
index 60c9eb7331c,1a60904e647..3263073d453
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@@ -159,7 -159,7 +159,7 @@@ the
  	builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
  fi
  
- CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
 -CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
++CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
  
  SMB_WRITE_PERLVARS(build/smb_build/config.pm)
  
diff --cc source4/torture/local/config.mk
index b57093178e6,fede753c68c..ad69183205d
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@@ -20,11 -20,11 +20,11 @@@ PRIVATE_DEPENDENCIES = 
  
  TORTURE_LOCAL_OBJ_FILES = \
  		$(torturesrcdir)/../lib/charset/tests/iconv.o \
 -		$(torturesrcdir)/../lib/talloc/testsuite.o \
 +		$(torturesrcdir)/../../talloc/testsuite.o \
- 		$(torturesrcdir)/../lib/replace/test/getifaddrs.o \
- 		$(torturesrcdir)/../lib/replace/test/os2_delete.o \
- 		$(torturesrcdir)/../lib/replace/test/strptime.o \
- 		$(torturesrcdir)/../lib/replace/test/testsuite.o \
+ 		$(torturesrcdir)/../../replace/test/getifaddrs.o \
+ 		$(torturesrcdir)/../../replace/test/os2_delete.o \
+ 		$(torturesrcdir)/../../replace/test/strptime.o \
+ 		$(torturesrcdir)/../../replace/test/testsuite.o \
  		$(torturesrcdir)/../lib/messaging/tests/messaging.o \
  		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
  		$(torturesrcdir)/../librpc/tests/binding_string.o \