[SCM] Samba Shared Repository - branch master updated -
9c455879f02606127686cde50552af53ccff8cb8
Jelmer Vernooij
jelmer at samba.org
Mon Sep 15 16:01:18 GMT 2008
The branch, master has been updated
via 9c455879f02606127686cde50552af53ccff8cb8 (commit)
via a3a4c9a1fd7ab6d8d4dc5af3727d43bb22f1219c (commit)
via e2e64b6a14c3da84eb8848ecbd1c9133deb827ca (commit)
via 25b08eb2e2645eece1a3fe20de988c9a2f328d36 (commit)
via b8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a (commit)
via 99d4af748f92396d47609fffaff7b1168897a5e9 (commit)
via c592ec0e13ea90528ceffc1a8d7c83637d0f0dbf (commit)
from c4f361a17f51e4897ac2faafc65ebc8349e19001 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9c455879f02606127686cde50552af53ccff8cb8
Merge: a3a4c9a1fd7ab6d8d4dc5af3727d43bb22f1219c c4f361a17f51e4897ac2faafc65ebc8349e19001
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 18:00:55 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky
commit a3a4c9a1fd7ab6d8d4dc5af3727d43bb22f1219c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 15:49:27 2008 +0200
Fix standalone build.
commit e2e64b6a14c3da84eb8848ecbd1c9133deb827ca
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 15:23:29 2008 +0200
Ignore generated Samba 4 files.
commit 25b08eb2e2645eece1a3fe20de988c9a2f328d36
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 15:16:54 2008 +0200
Add flag for merged build.
commit b8e8e9f0a58bf2d8c3f6fb6b29ff5e86f19b7a3a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 14:56:46 2008 +0200
Ignore generated build files.
commit 99d4af748f92396d47609fffaff7b1168897a5e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 14:32:58 2008 +0200
Use new Samba 4 source location.
commit c592ec0e13ea90528ceffc1a8d7c83637d0f0dbf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Sep 15 14:30:15 2008 +0200
Import merged build patch.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 6 ++
source3/Makefile.in | 42 ++++-------
source3/autogen.sh | 2 +-
source3/configure.in | 14 +++-
source3/samba4-templates.mk | 145 ++++++++++++++++++++++++++++++++++++
source3/samba4.m4 | 138 +++++++++++++++++++++++++++++++++++
source3/samba4.mk | 170 +++++++++++++++++++++++++++++++++++++++++++
7 files changed, 487 insertions(+), 30 deletions(-)
create mode 100644 source3/samba4-templates.mk
create mode 100644 source3/samba4.m4
create mode 100644 source3/samba4.mk
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index b72ebe6..0b94be5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,8 @@ source3/smbd/build_options.c
source3/st
source3/tags
source3/TAGS
+source3/samba4-data.mk
+source3/samba4-config.mk
source3/torture.tdb
source4/apidocs
source4/auth/auth_proto.h
@@ -296,6 +298,10 @@ source4/winbind/idmap_proto.h
source4/winbind/wb_helper.h
source4/winbind/wb_proto.h
source4/wrepl_server/wrepl_server_proto.h
+source4/heimdal/lib/roken/roken.h
+source4/lib/ldb-samba/ldif_handlers_proto.h
+source4/libcli/drsblobs_proto.h
+source4/ntvfs/posix/vfs_acl_proto.h
*.swp
tags
*.x
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b67cfe8..31387c3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -150,12 +150,7 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
-FLAGS2 =
-FLAGS3 =
-FLAGS4 = -I$(CTDBDIR)/include
-FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
-FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
+FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) -I$(CTDBDIR)/include $(ISA) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
-DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \
@@ -1169,14 +1164,13 @@ modules:: SHOWFLAGS $(MODULES)
#####################################################################
## Perl IDL Compiler
-IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
- srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \
- epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
- dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
- nbt.idl
-
-idl::
- @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+samba3-idl::
+ @IDL_FILES="lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
+ srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \
+ epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
+ dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
+ nbt.idl" \
+ CPP="$(CPP)" PERL="$(PERL)" \
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
@@ -1190,7 +1184,7 @@ everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctor
.SUFFIXES: .c .o .lo
SHOWFLAGS::
- @echo "Using FLAGS = $(FLAGS)"
+ @echo "Using CFLAGS = $(CFLAGS)"
@echo " PICFLAG = $(PICFLAG)"
@echo " LIBS = $(LIBS)"
@echo " LDFLAGS = $(LDFLAGS)"
@@ -1208,11 +1202,11 @@ MAKEDIR = || exec false; \
exec false; fi || exec false
# Run a static checker.
-CHECK_CC = $(CC_CHECKER) -I. -I$(srcdir) $(FLAGS) $(PICFLAG) -c $< -o $@
+CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) -c $< -o $@
# Compile a source file.
-COMPILE_CC = $(CC) -I. -I$(srcdir) $(FLAGS) $(PICFLAG) -c $< -o $@
+COMPILE_CC = $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@
# Compile a source file with the installation paths defined.
-COMPILE_CC_PATH = $(CC) -I. -I$(srcdir) $(PATH_FLAGS) $(FLAGS) $(PICFLAG) -c $< -o $@
+COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(PICFLAG) -c $< -o $@
COMPILE = $(COMPILE_CC)
@@ -1226,7 +1220,7 @@ COMPILE = $(COMPILE_CC)
@echo Compiling $*.c
@$(COMPILE) && exit 0;\
echo "The following command failed:" 1>&2;\
- echo "$(COMPILE_CC)" 1>&2;\
+ echo "$(subst ",\",$(COMPILE_CC))" 1>&2;\
$(COMPILE_CC) >/dev/null 2>&1
@BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
@@ -2627,17 +2621,11 @@ include/build_env.h: script/build_env.sh
> $(builddir)/include/build_env.h
proto::
- @echo
- @echo "NOTE: 'proto' is no longer a valid make target as proto.h"
- @echo "and other prototype headers are not generated anymore."
- @echo
-.PHONY: proto
-
-etags:
+etags::
etags `find $(srcdir) -name "*.[ch]"`
-ctags:
+ctags::
ctags `find $(srcdir) -name "*.[ch]"`
realclean:: clean
diff --git a/source3/autogen.sh b/source3/autogen.sh
index 018944e..355a742 100755
--- 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"
+IPATHS="-Im4 -Ilib/replace -I../source4"
echo "$0: running $AUTOHEADER $IPATHS"
$AUTOHEADER $IPATHS || exit 1
diff --git a/source3/configure.in b/source3/configure.in
index f813e87..248c39a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -131,8 +131,6 @@ else
CFLAGS="-O"
fi
-CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
-
m4_include(lib/socket_wrapper/config.m4)
m4_include(lib/nss_wrapper/config.m4)
@@ -6200,6 +6198,14 @@ MSG
fi
+AC_ARG_ENABLE(merged-build,
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+
+if test x$enable_merged_build = xyes; then
+ MERGED_BUILD=1
+ m4_include(samba4.m4)
+fi
+
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
LIB_REMOVE_USR_LIB(LDFLAGS)
LIB_REMOVE_USR_LIB(LIBS)
@@ -6248,6 +6254,10 @@ fi
SMBD_LIBS="$samba_dmapi_libs"
AC_SUBST(SMBD_LIBS)
+if test x$MERGED_BUILD != x1; then
+ CFLAGS="${CFLAGS} \$(FLAGS) -D_SAMBA_BUILD_=3"
+fi
+
AC_OUTPUT(Makefile
script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
lib/netapi/examples/Makefile
diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
new file mode 100644
index 0000000..154c3aa
--- /dev/null
+++ b/source3/samba4-templates.mk
@@ -0,0 +1,145 @@
+# Templates file for Samba 4
+# This relies on GNU make.
+#
+# © 2008 Jelmer Vernooij <jelmer at samba.org>
+#
+###############################################################################
+# Templates
+###############################################################################
+
+# Partially link
+# Arguments: target object file, source object files
+define partial_link_template
+$(1): $(2) ;
+ @echo Partially linking $$@
+ @mkdir -p $$(@D)
+ @$$(PARTLINK) -o $$@ $$^
+endef
+
+# Link a binary
+# Arguments: target file, depends, flags
+define binary_link_template
+$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+ @echo Linking $$@
+ @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3) $$(LIBS) $$(LIBREPLACE_OBJ)
+clean::
+ @rm -f $(1)
+
+binaries:: $(1)
+
+
+endef
+
+# Link a host-machine binary
+# Arguments: target file, depends, flags
+define host_binary_link_template
+$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+ @echo Linking $$@
+ @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3) $$(LIBREPLACE_OBJ)
+
+clean::
+ rm -f $(1)
+
+binaries:: $(1)
+
+
+endef
+
+# Create a prototype header
+# Arguments: header file, c files
+define proto_header_template
+echo:: ;
+ echo $(1) ;
+
+proto:: $(1) ;
+
+clean:: ;
+ rm -f $(1) ;
+
+$(1): $(2) ;
+ @echo "Creating $$@"
+ @$$(PERL) $$(srcdir)/../source4/script/mkproto.pl --srcdir=$$(srcdir)/../source4 --builddir=$$(builddir)/../source4 --public=/dev/null --private=$$@ $$^
+endef
+
+# Shared module
+# Arguments: Target, dependencies, objects
+define shared_module_template
+
+$(1): $(2) ;
+ @echo Linking $$@
+ @mkdir -p $$(@D)
+ @$$(MDLD) $$(LDFLAGS) $$(MDLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
+
+PLUGINS += $(1)
+
+endef
+
+# Shared library
+# Arguments: Target, dependencies, link flags, soname
+define shared_library_template
+$(1): $(2)
+ @echo Linking $$@
+ @mkdir -p $$(@D)
+ @$$(SHLD) $$(LDFLAGS) $$(SHLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) \
+ $(3) \
+ $$(if $$(SONAMEFLAG), $$(SONAMEFLAG)$(notdir $(4))) $$(LIBS)
+
+ifneq ($(notdir $(1)),$(notdir $(4)))
+$(4): $(1)
+ @echo "Creating symbolic link for $$@"
+ @ln -fs $$(<F) $$@
+endif
+
+ifneq ($(notdir $(1)),$(notdir $(5)))
+$(5): $(1)
+ @echo "Creating symbolic link for $$@"
+ @ln -fs $$(<F) $$@
+endif
+endef
+
+# Shared alias
+# Arguments: Target, subsystem name, alias name
+define shared_module_alias_template
+bin/modules/$(2)/$(3).$$(SHLIBEXT): $(1)
+ @ln -fs $$(<F) $$@
+
+PLUGINS += bin/modules/$(2)/$(3).$$(SHLIBEXT)
+
+uninstallplugins::
+ @-rm $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
+installplugins::
+ @ln -fs $(1) $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
+
+endef
+
+define shared_module_install_template
+installplugins:: bin/modules/$(1)/$(2)
+ @echo Installing $(2) as $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
+ @mkdir -p $$(DESTDIR)$$(modulesdir)/$(1)/
+ @cp bin/modules/$(1)/$(2) $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
+uninstallplugins::
+ @echo Uninstalling $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
+ @-rm $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
+
+endef
+
+# abspath for older makes
+abspath = $(shell cd $(dir $(1)); pwd)/$(notdir $(1))
+
+# Install a binary
+# Arguments: path to binary to install
+define binary_install_template
+installbin:: $$(DESTDIR)$$(bindir)/$(notdir $(1))4
+
+uninstallbin::
+ @echo "Removing $(notdir $(1))4"
+ @rm -f $$(DESTDIR)$$(bindir)/$(1)4
+endef
+
+define sbinary_install_template
+installsbin:: $$(DESTDIR)$$(sbindir)/$(notdir $(1))4 installdirs
+
+uninstallsbin::
+ @echo "Removing $(notdir $(1))4"
+ @rm -f $$(DESTDIR)$$(sbindir)/$(1)4
+endef
diff --git a/source3/samba4.m4 b/source3/samba4.m4
new file mode 100644
index 0000000..86047c1
--- /dev/null
+++ b/source3/samba4.m4
@@ -0,0 +1,138 @@
+BLDSHARED=true
+AC_SUBST(BLDSHARED)
+smbtorture4_path=bin/smbtorture4
+m4_include(build/m4/public.m4)
+
+m4_include(lib/smbreadline/readline.m4)
+m4_include(heimdal_build/internal.m4)
+m4_include(lib/util/fault.m4)
+m4_include(lib/util/signal.m4)
+m4_include(lib/util/util.m4)
+m4_include(lib/util/fsusage.m4)
+m4_include(lib/util/xattr.m4)
+m4_include(lib/util/capability.m4)
+m4_include(lib/util/time.m4)
+m4_include(lib/popt/samba.m4)
+m4_include(lib/charset/config.m4)
+m4_include(lib/socket/config.m4)
+m4_include(nsswitch/nsstest.m4)
+m4_include(pidl/config.m4)
+m4_include(lib/zlib.m4)
+
+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,
+ [],
+ [
+ SMB_INCLUDE_MK(lib/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)
+ ]
+)
+
+SMB_INCLUDE_MK(lib/tdb/python.mk)
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
+ [
+ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
+ SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
+ define_ldb_modulesdir=no
+ ],
+ [
+ # Here we need to do some tricks
+ # with AC_CONFIG_COMMANDS_PRE
+ # as that's the deferrs the commands
+ # to location after $prefix and $exec_prefix
+ # have usefull values and directly before
+ # creating config.status.
+ #
+ # The 'eval eval echo' trick is used to
+ # actually get the raw absolute directory
+ # path as this is needed in config.h
+ define_ldb_modulesdir=yes
+ AC_CONFIG_COMMANDS_PRE([
+ if test x"$define_ldb_modulesdir" = x"yes";then
+ LDB_MODULESDIR=`eval eval echo ${modulesdir}/ldb`
+ AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
+ fi
+ ])
+ 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(../source4/lib/ldb/ldb.pc)
+ ]
+)
+SMB_INCLUDE_MK(lib/ldb/python.mk)
+
+# Not sure why we need this..
+SMB_ENABLE(swig_ldb,YES)
+
+m4_include(lib/tls/config.m4)
+eventsdir="../source4/lib/events"
+m4_include(lib/events/libevents.m4)
+
+dnl m4_include(auth/kerberos/config.m4)
+m4_include(scripting/python/config.m4)
+m4_include(auth/gensec/config.m4)
+m4_include(smbd/process_model.m4)
+m4_include(ntvfs/posix/config.m4)
+m4_include(ntvfs/unixuid/config.m4)
+m4_include(auth/config.m4)
+m4_include(kdc/config.m4)
+m4_include(ntvfs/sysdep/config.m4)
+m4_include(lib/appweb/config.m4)
+m4_include(nsswitch/config.m4)
+
+dnl Samba 4 files
+AC_SUBST(LD)
+AC_LIBREPLACE_SHLD_FLAGS
+SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS])
+
+oldbuilddir="$builddir"
+builddir="$builddir/../source4"
+SMB_WRITE_PERLVARS(../source4/build/smb_build/config.pm)
+builddir="$oldbuilddir"
+
+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
+$SMB_INFO_LIBRARIES
+CEOF
+
+AC_OUTPUT_COMMANDS([
+cd ${srcdir}/../source4
+USESHARED=false $PERL -I${builddir} -I${builddir}/build \
+ -I. -Ibuild \
+ build/smb_build/main.pl --output=../source3/samba4-data.mk main.mk || exit $?
+cd ../source3
+],[
+srcdir="$srcdir"
+builddir="$builddir"
+PERL="$PERL"
+
+export PERL
+export srcdir
+export builddir
+])
+
+AC_CONFIG_COMMANDS([Makefile-samba4], [
+echo "include samba4.mk" >> ${builddir}/Makefile
+])
+
diff --git a/source3/samba4.mk b/source3/samba4.mk
new file mode 100644
index 0000000..a842d13
--- /dev/null
+++ b/source3/samba4.mk
@@ -0,0 +1,170 @@
+# samba 4 bits
+
+PROG_LD = $(LD)
+BNLD = $(CC)
+HOSTLD = $(CC)
+PARTLINK = $(PROG_LD) -r
+MDLD = $(SHLD)
+MDLD_FLAGS = $(LDSHFLAGS)
+
+samba4srcdir = $(call abspath,$(srcdir)/../source4)
+
+# Flags used for the samba 4 files
+# $(srcdir)/include is required for config.h
+SAMBA4_CFLAGS = -I$(samba4srcdir) -I$(samba4srcdir)/include \
+ -I$(samba4srcdir)/lib/replace -I$(samba4srcdir)/lib \
+ -I$(heimdalsrcdir)/lib/hcrypto -I$(tallocdir) \
+ -I$(srcdir)/include -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H
+
+.SUFFIXES: .ho
+
+# No cross compilation for now, thanks
+.c.ho:
+ @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
+ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
+ @if test -n "$(CC_CHECKER)"; then \
+ echo "Checking $*.c with '$(CC_CHECKER)'";\
+ $(CHECK_CC); \
+ fi
+ @echo Compiling $*.c
+ @$(COMPILE) && exit 0;\
--
Samba Shared Repository
More information about the samba-cvs
mailing list