Merge branch 'singlereplace' into single

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

diff --cc source3/configure.in
Simple merge

diff --cc source3/include/includes.h
Simple merge

diff --cc source4/configure.ac
index 60c9eb7331c0d8fea7432d8ecd174335ccec3114,1a60904e64718f2e9c1e1acaf1135d7d176407a5..3263073d4533c21becf2aeb018430ea931edf3bf
--- 1/source4/configure.ac
--- 2/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 b57093178e6ccca23ad60212d4947e363812f7f7,fede753c68c33a2e9c5f99ca0a3e4412c4e9fec0..ad69183205d35697b707425d3e08b9e66a70a4b8
--- 1/source4/torture/local/config.mk
--- 2/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 \