Merge branch 'singlereplace' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:45:10 +0000 (16:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:45:10 +0000 (16:45 +0200)
Conflicts:
source4/configure.ac
source4/torture/local/config.mk

1  2 
source3/configure.in
source3/include/includes.h
source4/configure.ac
source4/torture/local/config.mk

diff --combined source3/configure.in
index 446b833f0694f1f2f45a2b645daa4b72f816219d,70ea8839d165f6342a38d48863db5ef88c356e57..2801125b1138eac552b3a3fab41ce14aea78a69d
@@@ -23,7 -23,7 +23,7 @@@ m4_include(m4/check_path.m4
  
  AC_LIBREPLACE_CC_CHECKS
  
 -m4_include(lib/talloc/libtalloc.m4)
 +m4_include(../talloc/libtalloc.m4)
  
  LIBTALLOC_OBJ0=""
  for obj in ${TALLOC_OBJ}; do
@@@ -33,7 -33,7 +33,7 @@@ AC_SUBST(LIBTALLOC_OBJ0
  
  # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
  # but currently this fails: things have to get merged from s4.
 -tdbdir="lib/tdb"
 +tdbdir="../tdb"
  AC_SUBST(tdbdir)
  TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
  AC_SUBST(TDB_CFLAGS)
@@@ -43,12 -43,12 +43,12 @@@ for o in common/tdb.o common/dump.o com
             common/traverse.o common/freelist.o common/freelistcheck.o \
                 common/io.o common/lock.o common/open.o; 
  do 
 -      LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"
 +      LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
  done
  
  AC_SUBST(LIBTDB_OBJ0)
  SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../replace"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
  SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
index 0691a76235a7d8519d45b46be7f8b54005635b09,e87ac0ad3217637a1057b3c0de0b2ea3825c8a38..ccdc6d3fd3c19ecc17947340b8e6b707026b95fd
@@@ -25,7 -25,7 +25,7 @@@
  #undef SIZEOF_LONG
  #endif
  
- #include "lib/replace/replace.h"
+ #include "../replace/replace.h"
  
  /* make sure we have included the correct config.h */
  #ifndef NO_CONFIG_H /* for some tests */
@@@ -652,7 -652,7 +652,7 @@@ typedef char fstring[FSTRING_LEN]
  #include "tdb.h"
  #include "util_tdb.h"
  
 -#include "lib/talloc/talloc.h"
 +#include "../talloc/talloc.h"
  /* And a little extension. Abort on type mismatch */
  #define talloc_get_type_abort(ptr, type) \
        (type *)talloc_check_name_abort(ptr, #type)
diff --combined source4/configure.ac
index 60c9eb7331c0d8fea7432d8ecd174335ccec3114,1a60904e64718f2e9c1e1acaf1135d7d176407a5..3263073d4533c21becf2aeb018430ea931edf3bf
@@@ -11,7 -11,7 +11,7 @@@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Mar
  
  # Configuration rules.
  m4_include(build/m4/env.m4)
- m4_include(lib/replace/samba.m4)
+ m4_include(../replace/samba.m4)
  m4_include(lib/smbreadline/readline.m4)
  m4_include(heimdal_build/config.m4)
  m4_include(lib/util/fault.m4)
@@@ -41,20 -41,20 +41,20 @@@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
 -              m4_include(lib/talloc/libtalloc.m4)
 -              SMB_INCLUDE_MK(lib/talloc/config.mk)
 +              m4_include(../talloc/libtalloc.m4)
 +              SMB_INCLUDE_MK(../talloc/config.mk)
        ]
  )
  
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [],
        [
 -              m4_include(lib/tdb/libtdb.m4)
 -              SMB_INCLUDE_MK(lib/tdb/config.mk)
 +              m4_include(../tdb/libtdb.m4)
 +              SMB_INCLUDE_MK(../tdb/config.mk)
        ]
  )
  
 -SMB_INCLUDE_MK(lib/tdb/python.mk) 
 +SMB_INCLUDE_MK(../tdb/python.mk) 
  
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [
@@@ -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)
  
index b57093178e6ccca23ad60212d4947e363812f7f7,fede753c68c33a2e9c5f99ca0a3e4412c4e9fec0..ad69183205d35697b707425d3e08b9e66a70a4b8
@@@ -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 \