Use new Samba 4 source location.

diff --git a/source3/autogen.sh b/source3/autogen.sh
index 9c817b9b1d3b93e20d3876b25c5cb903c91f232d..355a742aa0377199e2a57af2ddc960d036a38825 100755 (executable)
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config.h*
 
-IPATHS="-Im4 -Ilib/replace -I../samba4/source"
+IPATHS="-Im4 -Ilib/replace -I../source4"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1

diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
index 3180be30d3d3e3364c5cc7485108d823c7f5a13d..154c3aabda7487be63f981b8e017f16ca113232b 100644 (file)
--- a/source3/samba4-templates.mk
+++ b/source3/samba4-templates.mk
@@ -58,7 +58,7 @@ clean:: ;
 
 $(1): $(2) ;
        @echo "Creating $$@"
-       @$$(PERL) $$(srcdir)/../samba4/source/script/mkproto.pl --srcdir=$$(srcdir)/../samba4/source --builddir=$$(builddir)/../samba4/source --public=/dev/null --private=$$@ $$^
+       @$$(PERL) $$(srcdir)/../source4/script/mkproto.pl --srcdir=$$(srcdir)/../source4 --builddir=$$(builddir)/../source4 --public=/dev/null --private=$$@ $$^
 endef
 
 # Shared module

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index edfc0092dcf2dbebdf6df8956efb4f8b9bdc746f..04f88950fff54317f4a9feff256ba515fe9bffba 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -19,14 +19,14 @@ m4_include(nsswitch/nsstest.m4)
 m4_include(pidl/config.m4)
 m4_include(lib/zlib.m4)
 
-AC_CONFIG_FILES(../samba4/source/lib/registry/registry.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/ndr.pc)
-AC_CONFIG_FILES(../samba4/source/lib/torture/torture.pc)
-AC_CONFIG_FILES(../samba4/source/auth/gensec/gensec.pc)
-AC_CONFIG_FILES(../samba4/source/param/samba-hostconfig.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc_samr.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc_atsvc.pc)
+AC_CONFIG_FILES(../source4/lib/registry/registry.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc.pc)
+AC_CONFIG_FILES(../source4/librpc/ndr.pc)
+AC_CONFIG_FILES(../source4/lib/torture/torture.pc)
+AC_CONFIG_FILES(../source4/auth/gensec/gensec.pc)
+AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc_samr.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
@@ -69,12 +69,12 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
                        AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
                fi
                ])
-               ldbdir="\$(abspath \$(srcdir)/../samba4/source/lib/ldb)"
+               ldbdir="\$(abspath \$(srcdir)/../source4/lib/ldb)"
                AC_SUBST(ldbdir)
                m4_include(lib/ldb/sqlite3.m4)
                m4_include(lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(lib/ldb/config.mk)
-               AC_CONFIG_FILES(../samba4/source/lib/ldb/ldb.pc)
+               AC_CONFIG_FILES(../source4/lib/ldb/ldb.pc)
        ]
 )
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
@@ -83,7 +83,7 @@ SMB_INCLUDE_MK(lib/ldb/python.mk)
 SMB_ENABLE(swig_ldb,YES)
 
 m4_include(lib/tls/config.m4)
-eventsdir="../samba4/source/lib/events"
+eventsdir="../source4/lib/events"
 m4_include(lib/events/libevents.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
@@ -104,12 +104,12 @@ AC_LIBREPLACE_SHLD_FLAGS
 SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ])
                 
 oldbuilddir="$builddir"
-builddir="$builddir/../samba4/source"
-SMB_WRITE_PERLVARS(../samba4/source/build/smb_build/config.pm)
+builddir="$builddir/../source4"
+SMB_WRITE_PERLVARS(../source4/build/smb_build/config.pm)
 builddir="$oldbuilddir"
 
-echo "configure: creating ../samba4/source/config.mk"
-cat >../samba4/source/config.mk<<CEOF
+echo "configure: creating ../source4/config.mk"
+cat >../source4/config.mk<<CEOF
 # config.mk - Autogenerated by configure, DO NOT EDIT!
 $SMB_INFO_EXT_LIBS
 $SMB_INFO_SUBSYSTEMS
@@ -117,7 +117,7 @@ $SMB_INFO_LIBRARIES
 CEOF
 
 AC_OUTPUT_COMMANDS([
-cd ${srcdir}/../samba4/source
+cd ${srcdir}/../source4
 USESHARED=false $PERL -I${builddir} -I${builddir}/build \
     -I. -Ibuild \
     build/smb_build/main.pl --output=../../source/samba4-data.mk main.mk || exit $?

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 7d2489c3d0d5fb430bc923cdd361b3c0971b6e6c..a842d1312afcb1b11c96fd95583643844b80a1c8 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -7,7 +7,7 @@ PARTLINK = $(PROG_LD) -r
 MDLD = $(SHLD)
 MDLD_FLAGS = $(LDSHFLAGS) 
 
-samba4srcdir = $(call abspath,$(srcdir)/../samba4/source)
+samba4srcdir = $(call abspath,$(srcdir)/../source4)
 
 # Flags used for the samba 4 files
 # $(srcdir)/include is required for config.h