[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri May 7 10:34:42 MDT 2010
The branch, master has been updated
via 961993b... s3-merged: Make sure bin/ exists when copying in bin/smbtorture4.
via 169aaba... s3-merged: Use newly added waf reconfigure subcommand.
via 9542155... Reintroduce merged build, using waf to build smbtorture4.
via 674a78d... Revert "Revert "s3-build: Remove --enable-merged support.""
via c18d58b... samba3: Generate C files from IDL in source3/librpc/gen_ndr rather than librpc/gen_ndr.
from 5b7163a... Only MULTIPLE-UNLOCK test left to fix !
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 961993bc9126a85338303034718341576e783761
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 7 18:30:46 2010 +0200
s3-merged: Make sure bin/ exists when copying in bin/smbtorture4.
commit 169aabae702c2ff7d5c59d387265dd842784bd36
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 6 15:31:48 2010 +0200
s3-merged: Use newly added waf reconfigure subcommand.
commit 95421552be87d17353ba5a351a096e2b4bfdfae8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 6 14:08:49 2010 +0200
Reintroduce merged build, using waf to build smbtorture4.
commit 674a78d60a7dbc4d2af1b229a6b3b2a96c2517f3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 6 12:00:01 2010 +0200
Revert "Revert "s3-build: Remove --enable-merged support.""
This reverts commit 8f8e7c788a12d1e0bda9183ed765cc1048e105f7.
commit c18d58b854836fc8df56883f7197d6fce0d70c1d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 6 11:49:10 2010 +0200
samba3: Generate C files from IDL in source3/librpc/gen_ndr rather than
librpc/gen_ndr.
This is done to make it possible to run waf in the source4/ tree at
the same time, since waf has problems with files that were generated by
something else.
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 132 ++++++++++++----------
source3/configure.in | 16 +--
source3/samba4-templates.mk | 144 -----------------------
source3/samba4.m4 | 211 ----------------------------------
source3/samba4.mk | 265 -------------------------------------------
5 files changed, 79 insertions(+), 689 deletions(-)
delete mode 100644 source3/samba4-templates.mk
delete mode 100644 source3/samba4.m4
delete mode 100644 source3/samba4.mk
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ac936e4..3184d03 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -286,9 +286,9 @@ PASSCHANGE_OBJ = libsmb/passchange.o
LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
../librpc/ndr/ndr_compression.o \
- ../librpc/gen_ndr/ndr_drsuapi.o \
+ librpc/gen_ndr/ndr_drsuapi.o \
../librpc/ndr/ndr_drsblobs.o \
- ../librpc/gen_ndr/ndr_drsblobs.o
+ librpc/gen_ndr/ndr_drsblobs.o
ZLIB_OBJ = @ZLIB_OBJS@
@@ -299,47 +299,47 @@ COMPRESSION_OBJ = ../lib/compression/mszip.o \
DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
$(COMPRESSION_OBJ)
-LIBNDR_NTLMSSP_OBJ = ../librpc/gen_ndr/ndr_ntlmssp.o \
+LIBNDR_NTLMSSP_OBJ = librpc/gen_ndr/ndr_ntlmssp.o \
../librpc/ndr/ndr_ntlmssp.o
LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
../librpc/ndr/ndr.o \
../librpc/ndr/ndr_misc.o \
- ../librpc/gen_ndr/ndr_misc.o \
- ../librpc/gen_ndr/ndr_security.o \
+ librpc/gen_ndr/ndr_misc.o \
+ librpc/gen_ndr/ndr_security.o \
../librpc/ndr/ndr_sec_helper.o \
librpc/ndr/ndr_string.o \
../librpc/ndr/uuid.o \
librpc/ndr/util.o \
- ../librpc/gen_ndr/ndr_dcerpc.o
+ librpc/gen_ndr/ndr_dcerpc.o
RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
-LIBNDR_GEN_OBJ0 = ../librpc/gen_ndr/ndr_samr.o \
- ../librpc/gen_ndr/ndr_lsa.o
+LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
+ librpc/gen_ndr/ndr_lsa.o
-LIBNDR_GEN_OBJ1 = ../librpc/gen_ndr/ndr_netlogon.o \
+LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o \
../librpc/ndr/ndr_netlogon.o
-LIBNDR_GEN_OBJ2 = ../librpc/gen_ndr/ndr_spoolss.o \
+LIBNDR_GEN_OBJ2 = librpc/gen_ndr/ndr_spoolss.o \
../librpc/ndr/ndr_spoolss_buf.o
-LIBNDR_GEN_OBJ = ../librpc/gen_ndr/ndr_wkssvc.o \
+LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
- ../librpc/gen_ndr/ndr_dfs.o \
- ../librpc/gen_ndr/ndr_echo.o \
- ../librpc/gen_ndr/ndr_winreg.o \
- ../librpc/gen_ndr/ndr_initshutdown.o \
- ../librpc/gen_ndr/ndr_srvsvc.o \
- ../librpc/gen_ndr/ndr_eventlog.o \
+ librpc/gen_ndr/ndr_dfs.o \
+ librpc/gen_ndr/ndr_echo.o \
+ librpc/gen_ndr/ndr_winreg.o \
+ librpc/gen_ndr/ndr_initshutdown.o \
+ librpc/gen_ndr/ndr_srvsvc.o \
+ librpc/gen_ndr/ndr_eventlog.o \
$(LIBNDR_GEN_OBJ1) \
- ../librpc/gen_ndr/ndr_dssetup.o \
+ librpc/gen_ndr/ndr_dssetup.o \
librpc/gen_ndr/ndr_notify.o \
- ../librpc/gen_ndr/ndr_xattr.o \
+ librpc/gen_ndr/ndr_xattr.o \
../librpc/ndr/ndr_xattr.o \
- ../librpc/gen_ndr/ndr_epmapper.o \
- ../librpc/gen_ndr/ndr_named_pipe_auth.o \
- ../librpc/gen_ndr/ndr_ntsvcs.o \
+ librpc/gen_ndr/ndr_epmapper.o \
+ librpc/gen_ndr/ndr_named_pipe_auth.o \
+ librpc/gen_ndr/ndr_ntsvcs.o \
$(LIBNDR_GEN_OBJ2)
RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
@@ -451,7 +451,7 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
../librpc/ndr/ndr_krb5pac.o \
- ../librpc/gen_ndr/ndr_krb5pac.o
+ librpc/gen_ndr/ndr_krb5pac.o
SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o \
librpc/gen_ndr/ndr_secrets.o
@@ -459,8 +459,8 @@ SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o \
LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
../libcli/netlogon.o \
../libcli/ndr_netlogon.o \
- ../librpc/gen_ndr/ndr_nbt.o \
- ../librpc/gen_ndr/ndr_svcctl.o \
+ librpc/gen_ndr/ndr_nbt.o \
+ librpc/gen_ndr/ndr_svcctl.o \
../librpc/ndr/ndr_svcctl.o
LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
@@ -507,7 +507,7 @@ TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o
SCHANNEL_OBJ = ../libcli/auth/credentials.o \
../libcli/auth/schannel_sign.o \
../libcli/auth/schannel_state_tdb.o \
- ../librpc/gen_ndr/ndr_schannel.o \
+ librpc/gen_ndr/ndr_schannel.o \
../librpc/ndr/ndr_schannel.o
LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
@@ -537,22 +537,22 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
rpc_client/init_samr.o \
../librpc/rpc/binding.o
-LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \
- ../librpc/gen_ndr/cli_dfs.o \
- ../librpc/gen_ndr/cli_echo.o \
- ../librpc/gen_ndr/cli_srvsvc.o \
- ../librpc/gen_ndr/cli_svcctl.o \
- ../librpc/gen_ndr/cli_winreg.o \
- ../librpc/gen_ndr/cli_initshutdown.o \
- ../librpc/gen_ndr/cli_eventlog.o \
- ../librpc/gen_ndr/cli_wkssvc.o \
- ../librpc/gen_ndr/cli_netlogon.o \
- ../librpc/gen_ndr/cli_samr.o \
- ../librpc/gen_ndr/cli_dssetup.o \
- ../librpc/gen_ndr/cli_ntsvcs.o \
- ../librpc/gen_ndr/cli_epmapper.o \
- ../librpc/gen_ndr/cli_drsuapi.o \
- ../librpc/gen_ndr/cli_spoolss.o \
+LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
+ librpc/gen_ndr/cli_dfs.o \
+ librpc/gen_ndr/cli_echo.o \
+ librpc/gen_ndr/cli_srvsvc.o \
+ librpc/gen_ndr/cli_svcctl.o \
+ librpc/gen_ndr/cli_winreg.o \
+ librpc/gen_ndr/cli_initshutdown.o \
+ librpc/gen_ndr/cli_eventlog.o \
+ librpc/gen_ndr/cli_wkssvc.o \
+ librpc/gen_ndr/cli_netlogon.o \
+ librpc/gen_ndr/cli_samr.o \
+ librpc/gen_ndr/cli_dssetup.o \
+ librpc/gen_ndr/cli_ntsvcs.o \
+ librpc/gen_ndr/cli_epmapper.o \
+ librpc/gen_ndr/cli_drsuapi.o \
+ librpc/gen_ndr/cli_spoolss.o \
$(LIBNDR_GEN_OBJ) \
$(RPCCLIENT_NDR_OBJ)
@@ -608,49 +608,49 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
-RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
+RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
RPC_NETLOG_OBJ = rpc_server/srv_netlog_nt.o \
- ../librpc/gen_ndr/srv_netlogon.o
+ librpc/gen_ndr/srv_netlogon.o
RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
rpc_server/srv_samr_util.o \
- ../librpc/gen_ndr/srv_samr.o
+ librpc/gen_ndr/srv_samr.o
-RPC_INITSHUTDOWN_OBJ = ../librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
RPC_REG_OBJ = rpc_server/srv_winreg_nt.o \
- ../librpc/gen_ndr/srv_winreg.o
+ librpc/gen_ndr/srv_winreg.o
-RPC_DSSETUP_OBJ = rpc_server/srv_dssetup_nt.o ../librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ = rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
- ../librpc/gen_ndr/srv_srvsvc.o
+ librpc/gen_ndr/srv_srvsvc.o
-RPC_WKS_OBJ = ../librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
+RPC_WKS_OBJ = librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
RPC_SVCCTL_OBJ = rpc_server/srv_svcctl_nt.o \
- ../librpc/gen_ndr/srv_svcctl.o \
+ librpc/gen_ndr/srv_svcctl.o \
services/svc_spoolss.o services/svc_rcinit.o services/services_db.o \
services/svc_netlogon.o services/svc_winreg.o \
services/svc_wins.o
RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \
- ../librpc/gen_ndr/srv_ntsvcs.o
+ librpc/gen_ndr/srv_ntsvcs.o
-RPC_DFS_OBJ = ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
+RPC_DFS_OBJ = librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
rpc_server/srv_spoolss_util.o \
- ../librpc/gen_ndr/srv_spoolss.o
+ librpc/gen_ndr/srv_spoolss.o
RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
- $(LIB_EVENTLOG_OBJ) ../librpc/gen_ndr/srv_eventlog.o
+ $(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \
rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
-RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o ../librpc/gen_ndr/srv_echo.o
+RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
@@ -1104,8 +1104,8 @@ EVTLOGADM_OBJ0 = utils/eventlogadm.o
EVTLOGADM_OBJ = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_ERR_OBJ) \
registry/reg_eventlog.o $(LIB_EVENTLOG_OBJ) \
- ../librpc/gen_ndr/ndr_eventlog.o \
- ../librpc/gen_ndr/ndr_lsa.o
+ librpc/gen_ndr/ndr_eventlog.o \
+ librpc/gen_ndr/ndr_lsa.o
SHARESEC_OBJ0 = utils/sharesec.o
SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
@@ -1399,7 +1399,7 @@ $(LIBSMBCLIENT_THREAD_OBJ) ../nsswitch/wins.o ../nsswitch/winbind_nss_linux.o: E
#####################################################################
## Perl IDL Compiler
samba3-idl::
- @PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+ @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl
@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \
@@ -3213,3 +3213,17 @@ libnetapi_examples: libnetapi
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
+
+../source4/configure: ../buildtools/scripts/configure.waf
+ cd ../source4 && ./autogen.sh
+
+samba4-configure:
+ @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure --prefix="$(prefix)" )
+
+.PHONY: samba4-configure
+
+bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
+ cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
+ cp ../source4/bin/smbtorture bin/smbtorture4
+
+.PHONY: bin/smbtorture4
diff --git a/source3/configure.in b/source3/configure.in
index 050c16a..2e677d7 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -201,7 +201,7 @@ AC_PROG_INSTALL
AC_PROG_AWK
# Check for GNU make
m4_include(../m4/check_make.m4)
-AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
+AC_SAMBA_GNU_MAKE([true], [true])
# Check for perl
m4_include(../m4/check_perl.m4)
@@ -6659,7 +6659,10 @@ if test x$enable_merged_build = xyes; then
MERGED_BUILD=1
saved_USESHARED="$USESHARED"
USESHARED="false"
- m4_include(samba4.m4)
+ smbtorture4_path="bin/smbtorture4"
+ smbtorture4_option="-t bin/smbtorture4"
+ AC_SUBST(smbtorture4_path)
+ AC_SUBST(smbtorture4_option)
USESHARED="$saved_USESHARED"
fi
@@ -6734,14 +6737,7 @@ SMBD_LIBS="$samba_dmapi_libs"
AC_SUBST(SMBD_LIBS)
CFLAGS="${CFLAGS} \$(FLAGS)"
-
-if test x$MERGED_BUILD != x1; then
- CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
-else
- if test x"$BLDSHARED" = x"true" ; then
- LDFLAGS="$LDFLAGS -L./bin"
- fi
-fi
+CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
AC_SUBST(MAKEFILE)
if test x$samba_cv_gnu_make = xyes; then
diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
deleted file mode 100644
index 0024a75..0000000
--- a/source3/samba4-templates.mk
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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) ;
- @echo Linking $$@
- @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3) $$(LIBS)
-clean::
- @rm -f $(1)
-
-everything:: $(1)4
-
-endef
-
-# Link a host-machine binary
-# Arguments: target file, depends, flags
-define host_binary_link_template
-$(1)4: $(2) ;
- @echo Linking $$@
- @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
-
-clean::
- rm -f $(1)
-
-binaries:: $(1)4
-
-
-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) $(4)
- @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
deleted file mode 100644
index fbc19f1..0000000
--- a/source3/samba4.m4
+++ /dev/null
@@ -1,211 +0,0 @@
-AC_SUBST(BLDSHARED)
-smbtorture4_path="bin/smbtorture4"
-smbtorture4_option="-t bin/smbtorture4"
-m4_include(build/m4/public.m4)
-
-m4_include(../m4/check_python.m4)
-
-AC_SAMBA_PYTHON_DEVEL([
-SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
-SMB_ENABLE(EXT_LIB_PYTHON,YES)
-SMB_ENABLE(LIBPYTHON,YES)
-],[
-AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
-])
-
-AC_MSG_CHECKING(python library directory)
-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
-AC_MSG_RESULT($pythondir)
-
-AC_SUBST(pythondir)
-
-SMB_EXT_LIB(LIBREPLACE_EXT, [${LIBDL} ${CRYPT_LIBS}])
-SMB_ENABLE(LIBREPLACE_EXT)
-
-SMB_EXT_LIB(LIBREPLACE_NETWORK, [${LIBREPLACE_NETWORK_LIBS}])
-SMB_ENABLE(LIBREPLACE_NETWORK)
-
-SMB_SUBSYSTEM(LIBREPLACE,
- [${LIBREPLACE_OBJS}],
- [LIBREPLACE_EXT LIBREPLACE_NETWORK],
- [-I../lib/replace])
-
-LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
-
-SMB_SUBSYSTEM(LIBREPLACE_HOSTCC,
- [${LIBREPLACE_HOSTCC_OBJS}],
- [],
- [-I../lib/replace])
-
-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)
--
Samba Shared Repository
More information about the samba-cvs
mailing list