From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:17:29 +0100 Subject: s4: Remove the old perl/m4/make/mk-based build system. The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104 --- source4/smbd/config.mk | 44 ------------------------------- source4/smbd/process_model.m4 | 60 ------------------------------------------- source4/smbd/process_model.mk | 52 ------------------------------------- 3 files changed, 156 deletions(-) delete mode 100644 source4/smbd/config.mk delete mode 100644 source4/smbd/process_model.m4 delete mode 100644 source4/smbd/process_model.mk (limited to 'source4/smbd') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk deleted file mode 100644 index a77a18602f..0000000000 --- a/source4/smbd/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# server subsystem - -[SUBSYSTEM::service] -PRIVATE_DEPENDENCIES = \ - LIBTEVENT MESSAGING samba_socket \ - NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM \ - HEIMDAL_GSSAPI CREDENTIALS LIBTSOCKET - -service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ - service.o \ - service_stream.o \ - service_named_pipe.o \ - service_task.o) - -$(eval $(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c))) - -[SUBSYSTEM::PIDFILE] - -PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o - -$(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c))) - -[BINARY::samba] -INSTALLDIR = SBINDIR -PRIVATE_DEPENDENCIES = \ - LIBEVENTS \ - process_model \ - service \ - LIBSAMBA-HOSTCONFIG \ - LIBSAMBA-UTIL \ - POPT_SAMBA \ - PIDFILE \ - LIBPOPT \ - gensec \ - registry \ - ntptr \ - ntvfs \ - share \ - CLUSTER - -samba_OBJ_FILES = $(smbdsrcdir)/server.o -$(samba_OBJ_FILES): CFLAGS+=-DSTATIC_service_MODULES="$(service_INIT_FUNCTIONS)NULL" - -MANPAGES += $(smbdsrcdir)/samba.8 diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 deleted file mode 100644 index b2265bdac9..0000000000 --- a/source4/smbd/process_model.m4 +++ /dev/null @@ -1,60 +0,0 @@ -dnl # Server process model subsystem - -SMB_ENABLE(process_model_thread,NO) - -################################################# -# check for pthread support -AC_MSG_CHECKING(whether to use pthreads) -AC_ARG_WITH(pthreads, -[AS_HELP_STRING([--with-pthreads],[Include pthreads (default=no)])], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - if test x"$ac_cv_func_pread" != x"yes" -o x"$ac_cv_func_pwrite" != x"yes";then - AC_MSG_ERROR([You cannot enable threads when you don't have pread/pwrite!]) - fi - SMB_ENABLE(process_model_thread,YES) - SMB_ENABLE(PTHREAD,YES) - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], -AC_MSG_RESULT(no) -) - -SMB_EXT_LIB(PTHREAD,[-lpthread]) - -AC_MSG_CHECKING(whether to search for setproctitle support) -AC_ARG_WITH(setproctitle, -[AS_HELP_STRING([--with-setproctitle], [Search for setproctitle support (default=no)])], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - AC_CHECK_HEADERS(setproctitle.h) - AC_CHECK_FUNC(setproctitle, [], [ - AC_CHECK_LIB_EXT(setproctitle, SETPROCTITLE_LIBS, setproctitle) - ]) - AC_MSG_CHECKING(whether to use setproctitle) - if test x"$ac_cv_func_setproctitle" = x"yes" -o \ - \( x"$ac_cv_header_setproctitle_h" = x"yes" -a \ - x"$ac_cv_lib_ext_setproctitle_setproctitle" = x"yes" \) ; then - AC_MSG_RESULT(yes) - SMB_ENABLE(SETPROCTITLE, YES) - AC_DEFINE(HAVE_SETPROCTITLE,1,[Whether setproctitle() is available]) - else - AC_MSG_RESULT(no) - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], -AC_MSG_RESULT(no) -) - -SMB_EXT_LIB(SETPROCTITLE, - [${SETPROCTITLE_LIBS}], - [${SETPROCTITLE_CFLAGS}], - [${SETPROCTITLE_CPPFLAGS}], - [${SETPROCTITLE_LDFLAGS}]) diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk deleted file mode 100644 index d216edd401..0000000000 --- a/source4/smbd/process_model.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Server process model subsystem - -################################################ -# Start MODULE process_model_single -[MODULE::process_model_single] -INIT_FUNCTION = process_model_single_init -OUTPUT_TYPE = MERGED_OBJ -SUBSYSTEM = process_model -# End MODULE process_model_single -################################################ - -process_model_single_OBJ_FILES = $(smbdsrcdir)/process_single.o - -################################################ -# Start MODULE process_model_standard -[MODULE::process_model_standard] -INIT_FUNCTION = process_model_standard_init -SUBSYSTEM = process_model -PRIVATE_DEPENDENCIES = LIBEVENTS SETPROCTITLE -# End MODULE process_model_standard -################################################ - -process_model_standard_OBJ_FILES = $(smbdsrcdir)/process_standard.o - -################################################ -# Start MODULE process_model_thread -[MODULE::process_model_thread] -INIT_FUNCTION = process_model_thread_init -SUBSYSTEM = process_model -PRIVATE_DEPENDENCIES = PTHREAD -# End MODULE process_model_thread -################################################ - -process_model_thread_OBJ_FILES = $(smbdsrcdir)/process_thread.o - -################################################ -# Start MODULE process_model_prefork -[MODULE::process_model_prefork] -INIT_FUNCTION = process_model_prefork_init -SUBSYSTEM = process_model -PRIVATE_DEPENDENCIES = LIBEVENTS SETPROCTITLE -# End MODULE process_model_thread -################################################ - -process_model_prefork_OBJ_FILES = $(smbdsrcdir)/process_prefork.o - -[SUBSYSTEM::process_model] -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG - -process_model_OBJ_FILES = $(smbdsrcdir)/process_model.o - -$(eval $(call proto_header_template,$(smbdsrcdir)/process_model_proto.h,$(process_model_OBJ_FILES:.o=.c))) -- cgit