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 <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104

124 files changed, 0 insertions, 14196 deletions

diff --git a/source4/Makefile.in b/source4/Makefile.in
deleted file mode 100644
index 7c4f1416ff..0000000000
--- a/source4/Makefile.in
+++ /dev/null
@@ -1,314 +0,0 @@
-#!gmake
-# The Samba 4 Makefile.
-# This file is *NOT* autogenerated.
-#
-.DEFAULT_GOAL := all
-
-default: all
-
-include mkconfig.mk
-
-pidldir := $(srcdir)/../pidl
-
-basedir = $(prefix)
-swatdir = $(datadir)/swat
-setupdir = $(datadir)/setup
-ncalrpcdir = $(localstatedir)/ncalrpc
-shliboutputdir = $(builddir)/bin/shared
-
-BNLD = $(LD)
-BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
-
-HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
-HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
-
-$(srcdir)/version.h: $(srcdir)/VERSION
-	@$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
-
-ifneq ($(automatic_dependencies),yes)
-ALL_PREDEP = basics
-.NOTPARALLEL:
-endif
-
-regen_version::
-	@$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
-
-clean_pch::
-	@echo "Removing precompiled headers"
-	@-rm -f include/includes.h.gch
-
-pch:: clean_pch include/includes.h.gch
-
-.DEFAULT_GOAL := all
-
-ifneq ($(automatic_dependencies),yes)
-ALL_PREDEP = basics
-.NOTPARALLEL:
-endif
-
-base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli ../nsswitch ../libds
-
-include $(srcdir)/build/make/rules.mk
-include $(srcdir)/build/make/python.mk
-zlibsrcdir := ../lib/zlib
-dynconfigsrcdir := dynconfig
-heimdalsrcdir := heimdal
-dsdbsrcdir := dsdb
-smbdsrcdir := smbd
-clustersrcdir := cluster
-libnetsrcdir := libnet
-authsrcdir := auth
-nsswitchsrcdir := ../nsswitch
-libwbclientsrcdir := ../nsswitch/libwbclient
-libsrcdir := lib
-libsocketsrcdir := lib/socket
-libcharsetsrcdir := ../lib/util/charset
-ldb_sambasrcdir := lib/ldb-samba
-tdbsrcdir := ../lib/tdb
-ldbsrcdir := lib/ldb
-libtlssrcdir := lib/tls
-libregistrysrcdir := lib/registry
-smbreadlinesrcdir := ../libcli/smbreadline
-libmessagingsrcdir := lib/messaging
-libteventsrcdir := ../lib/tevent
-libeventssrcdir := lib/events
-libcmdlinesrcdir := lib/cmdline
-poptsrcdir := ../lib/popt
-socketwrappersrcdir := ../lib/socket_wrapper
-nsswrappersrcdir := ../lib/nss_wrapper
-uidwrappersrcdir := ../lib/uid_wrapper
-appwebsrcdir := lib/appweb
-libstreamsrcdir := lib/stream
-libutilsrcdir := ../lib/util
-libtdrsrcdir := ../lib/tdr
-libcryptosrcdir := ../lib/crypto
-libtorturesrcdir := ../lib/torture
-smb_serversrcdir := smb_server
-libcompressionsrcdir := ../lib/compression
-libgencachesrcdir := lib
-paramsrcdir := param
-rpc_serversrcdir := rpc_server
-ldap_serversrcdir := ldap_server
-web_serversrcdir := web_server
-winbindsrcdir := winbind
-nbt_serversrcdir := nbt_server
-wrepl_serversrcdir := wrepl_server
-cldap_serversrcdir := cldap_server
-utilssrcdir := utils
-clientsrcdir := client
-torturesrcdir := torture
-ntvfssrcdir := ntvfs
-ntptrsrcdir := ntptr
-librpcsrcdir := librpc
-libclisrcdir := libcli
-libclicommonsrcdir := ../libcli
-libclinbtsrcdir := ../libcli/nbt
-pyscriptsrcdir := $(srcdir)/scripting/python
-kdcsrcdir := kdc
-ntp_signdsrcdir := ntp_signd
-wmisrcdir := lib/wmi
-tallocsrcdir := ../lib/talloc
-comsrcdir := $(srcdir)/lib/com
-policydir := lib/policy
-
-include data.mk
-
-$(DESTDIR)$(bindir)/%: scripting/bin/% installdirs
-	@mkdir -p $(@D)
-	@echo Installing $(@F) as $@
-	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
-	@cp $< $@
-	@chmod $(INSTALLPERMS) $@
-
-pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
-
-DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
-		   include/includes.d
-
-ifeq ($(automatic_dependencies),yes)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),distclean)
-ifneq ($(MAKECMDGOALS),realdistclean)
-ifneq ($(SKIP_DEP_FILES),yes)
--include $(DEP_FILES)
-endif
-endif
-endif
-endif
-
-ifneq ($(SKIP_DEP_FILES),yes)
-clean::
-	@echo Removing dependency files
-	@find . -name '*.d' -o -name '*.hd' | xargs rm -f
-endif
-else
-include $(srcdir)/static_deps.mk
-endif
-
-clean::
-	@find $(base_srcdirs) -name '*.o' -o -name '*.ho' | xargs rm -f
-
-PUBLIC_HEADERS += ./version.h
-
-libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
-modules:: $(PLUGINS)
-headers:: $(PUBLIC_HEADERS)
-manpages:: $(MANPAGES)
-all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
-everything:: all
-
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
-
-# 'make testsuite' creates all binaries which are
-# needed by samba3's 'make test' and the build-farm
-# scripts use that it as fallback in case
-# 'make everything' fails
-testsuite:: bin/smbclient bin/cifsdd bin/smbtorture bin/nmblookup
-
-showlayout:: 
-	@echo 'Samba will be installed into:'
-	@echo '  basedir:     $(basedir)'
-	@echo '  bindir:      $(bindir)'
-	@echo '  sbindir:     $(sbindir)'
-	@echo '  libdir:      $(libdir)'
-	@echo '  modulesdir:  $(modulesdir)'
-	@echo '  includedir:  $(includedir)'
-	@echo '  vardir:      $(localstatedir)'
-	@echo '  privatedir:  $(privatedir)'
-	@echo '  piddir:      $(piddir)'
-	@echo '  lockdir:     $(lockdir)'
-	@echo '  logfilebase: $(logfilebase)'
-	@echo '  setupdir:    $(setupdir)'
-	@echo '  swatdir:     $(swatdir)'
-	@echo '  mandir:      $(mandir)'
-	@echo '  datadir:     $(datadir)'
-	@echo '  winbindd_socket_dir:  $(winbindd_socket_dir)'
-	@echo '  ntp_signd_socket_dir:  $(ntp_signd_socket_dir)'
-
-showflags::
-	@echo '  srcdir     = $(srcdir)'
-	@echo '  builddir   = $(builddir)'
-
-# The permissions to give the executables
-INSTALLPERMS = 0755
-
-install:: showlayout everything installbin installsbin installdat installmisc \
-	      installlib installheader installpc installplugins
-
-# DESTDIR is used here to prevent packagers wasting their time
-# duplicating the Makefile. Remove it and you will have the privilege
-# of packaging each samba release for multiple versions of multiple
-# distributions and operating systems, or at least supplying patches
-# to all the packaging files required for this, prior to committing
-# the removal of DESTDIR. Do not remove it even though you think it
-# is not used.
-
-installdirs::
-	@$(SHELL) $(srcdir)/script/installdirs.sh \
-		$(DESTDIR)$(basedir) \
-		$(DESTDIR)$(bindir) \
-		$(DESTDIR)$(sbindir) \
-		$(DESTDIR)$(libdir) \
-		$(DESTDIR)$(modulesdir) \
-		$(DESTDIR)$(modulesdir)/ldb \
-		$(DESTDIR)$(mandir) \
-		$(DESTDIR)$(localstatedir) \
-		$(DESTDIR)$(localstatedir)/lib \
-		$(DESTDIR)$(localstatedir)/run \
-		$(DESTDIR)$(privatedir) \
-		$(DESTDIR)$(datadir) \
-		$(DESTDIR)$(piddir) \
-		$(DESTDIR)$(lockdir) \
-		$(DESTDIR)$(logfilebase) \
-		$(DESTDIR)$(privatedir)/tls \
-		$(DESTDIR)$(includedir) \
-		$(DESTDIR)$(pkgconfigdir) \
-		$(DESTDIR)$(sysconfdir)
-
-installbin:: installdirs
-
-installplugins::
-
-installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs
-	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(SHARED_LIBS) 
-	#@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
-
-installheader:: headers installdirs
-	@srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS)
-
-installdat:: installdirs
-	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)
-
-installman:: manpages installdirs
-	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
-
-installmisc:: installdirs
-	@$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
-
-installpc:: installdirs
-	@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)
-
-uninstall:: uninstallbin uninstallsbin uninstalldat uninstallmisc uninstalllib uninstallheader \
-			uninstallman uninstallpc uninstallplugins
-
-uninstallmisc::
-	@echo "Removing MISC files"
-	@rm -rf $(DESTDIR)$(setupdir)/*
-
-$(DESTDIR)$(bindir)/%: bin/% installdirs
-	@mkdir -p $(@D)
-	@echo Installing $(@F) as $@
-	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
-	@cp $< $@
-	@chmod $(INSTALLPERMS) $@
-
-$(DESTDIR)$(sbindir)/%: bin/% installdirs
-	@mkdir -p $(@D)
-	@echo Installing $(@F) as $@
-	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
-	@cp $< $@
-	@chmod $(INSTALLPERMS) $@
-
-uninstalldat::
-	@echo "Removing DAT files"
-	@rm -fr $(DESTDIR)$(datadir)/*
-
-uninstallbin::
-
-uninstalllib::
-	@echo "Removing libraries"
-	@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS)
-
-uninstallheader::
-	@echo "Removing headers"
-	@rm -fr $(DESTDIR)$(includedir)/*
-
-uninstallman::
-	@echo "Removing manpages"
-	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(mandir) $(MANPAGES)
-
-uninstallplugins::
-
-uninstallpc::
-	@echo "Removing package configurations"
-	@cd $(DESTDIR)$(pkgconfigdir); rm -f $(notdir $(PC_FILES))
-
-config.status:
-	@echo "config.status does not exist. Please run ./configure."
-	@/bin/false
-
-data.mk: config.status $(MK_FILES)
-	./config.status
-
-testcov-html:: 
-
-include $(pidldir)/config.mk
-selftestdir := $(srcdir)/../selftest
-include $(srcdir)/selftest/config.mk
-
-showflags::
-	@echo '  pwd        = '`/bin/pwd`
-
-Makefile: Makefile.in
-	@echo "Makefile.in is newer than Makefile, please rerun ./config.status"
-	@false
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
deleted file mode 100644
index 8ad8f47cd6..0000000000
--- a/source4/aclocal.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-
-dnl Copied from libtool.m4
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-dnl Removes -I/usr/include/? from given variable
-AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-  ac_new_flags=""
-  for i in [$]$1; do
-    case [$]i in
-    -I/usr/include|-I/usr/include/) ;;
-    *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-    esac
-  done
-  $1=[$]ac_new_flags
-])
-    
-dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
-dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
-AC_DEFUN(LIB_REMOVE_USR_LIB,[
-  ac_new_flags=""
-  l=""
-  for i in [$]$1; do
-    case [$]l[$]i in
-    -L/usr/lib) ;;
-    -L/usr/lib/) ;;
-    -L/usr/lib64) ;;
-    -L/usr/lib64/) ;;
-    -Wl,-rpath,/usr/lib) l="";;
-    -Wl,-rpath,/usr/lib/) l="";;
-    -Wl,-rpath,/usr/lib64) l="";;
-    -Wl,-rpath,/usr/lib64/) l="";;
-    -Wl,-rpath) l=[$]i;;
-    -Wl,-rpath-Wl,/usr/lib) l="";;
-    -Wl,-rpath-Wl,/usr/lib/) l="";;
-    -Wl,-rpath-Wl,/usr/lib64) l="";;
-    -Wl,-rpath-Wl,/usr/lib64/) l="";;
-    *)
-    	s=" "
-        if test x"[$]ac_new_flags" = x""; then
-            s="";
-	fi
-        if test x"[$]l" = x""; then
-            ac_new_flags="[$]ac_new_flags[$]s[$]i";
-        else
-            ac_new_flags="[$]ac_new_flags[$]s[$]l [$]i";
-        fi
-        l=""
-        ;;
-    esac
-  done
-  $1=[$]ac_new_flags
-])
-
-m4_include(../lib/replace/libreplace.m4)
-m4_include(build/m4/ax_cflags_gcc_option.m4)
-m4_include(build/m4/ax_cflags_irix_option.m4)
-m4_include(build/m4/public.m4)
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
deleted file mode 100644
index 03fdadb4e2..0000000000
--- a/source4/auth/config.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################
-# start SMB_EXT_LIB_PAM
-# check for security/pam_appl.h and -lpam
-# Tests are now moved in ../nsswitch/config.m4 because winbind stuff require more pam tests
-# end SMB_EXT_LIB_PAM
-###############################
-
-################################################
-# test for where we get crypt() from
-AC_CHECK_LIB_EXT(crypt, CRYPT_LIBS, crypt)
-SMB_ENABLE(CRYPT,YES)
-SMB_EXT_LIB(CRYPT, $CRYPT_LIBS)
-
-AC_CHECK_FUNCS(crypt16 getauthuid getpwanam)
-
-AC_CHECK_HEADERS(sasl/sasl.h)
-AC_CHECK_LIB_EXT(sasl2, SASL_LIBS, sasl_client_init)
-
-if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
-	SMB_ENABLE(SASL,YES)
-	SMB_ENABLE(cyrus_sasl,YES)
-	SASL_CFLAGS="$CFLAGS"
-	SASL_CPPFLAGS="$CPPFLAGS"
-	SASL_LDFLAGS="$LDFLAGS"
-	LIB_REMOVE_USR_LIB(SASL_LDFLAGS)
-	CFLAGS_REMOVE_USR_INCLUDE(SASL_CPPFLAGS)
-	CFLAGS_REMOVE_USR_INCLUDE(SASL_CFLAGS)
-else
-	SMB_ENABLE(cyrus_sasl,NO)
-fi
-
-SMB_EXT_LIB(SASL, $SASL_LIBS, [${SASL_CFLAGS}], [${SASL_CPPFLAGS}], [${SASL_LDFLAGS}])
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
deleted file mode 100644
index 573f1972bc..0000000000
--- a/source4/auth/config.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# auth server subsystem
-gensecsrcdir := $(authsrcdir)/gensec
-mkinclude gensec/config.mk
-mkinclude kerberos/config.mk
-mkinclude ntlmssp/config.mk
-mkinclude ntlm/config.mk
-mkinclude credentials/config.mk
-
-[SUBSYSTEM::auth_session]
-PUBLIC_DEPENDENCIES = CREDENTIALS
-PRIVATE_DEPENDENCIES = SAMDB
-
-PUBLIC_HEADERS += $(authsrcdir)/session.h
-
-auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o)
-
-$(eval $(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::samba_server_gensec]
-PUBLIC_DEPENDENCIES = CREDENTIALS GENSEC auth 
-
-samba_server_gensec_OBJ_FILES = $(addprefix $(authsrcdir)/, samba_server_gensec.o)
-
-[SUBSYSTEM::auth_system_session]
-PUBLIC_DEPENDENCIES = CREDENTIALS
-PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY 
-
-auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o)
-$(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::auth_sam]
-PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
-PRIVATE_DEPENDENCIES = LDAP_ENCODE
-
-auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o)
-
-$(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::auth_sam_reply]
-
-auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o)
-
-$(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES:.o=.c)))
-
-[PYTHON::pyauth]
-LIBRARY_REALNAME = samba/auth.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = auth_system_session
-PRIVATE_DEPENDENCIES = SAMDB PYTALLOC pyparam_util
-
-pyauth_OBJ_FILES = $(authsrcdir)/pyauth.o
-
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
deleted file mode 100644
index 2d3518017d..0000000000
--- a/source4/auth/credentials/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#################################
-# Start SUBSYSTEM CREDENTIALS
-[SUBSYSTEM::CREDENTIALS]
-PUBLIC_DEPENDENCIES = \
-		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS HEIMDAL_GSSAPI
-PRIVATE_DEPENDENCIES = \
-		SECRETS SAMDB
-
-
-CREDENTIALS_OBJ_FILES = $(addprefix $(authsrcdir)/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
-
-$(eval $(call proto_header_template,$(authsrcdir)/credentials/credentials_proto.h,$(CREDENTIALS_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += $(authsrcdir)/credentials/credentials.h
-
-[PYTHON::pycredentials]
-LIBRARY_REALNAME = samba/credentials.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util
-
-pycredentials_OBJ_FILES = $(authsrcdir)/credentials/pycredentials.o
diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4
deleted file mode 100644
index b945afeea0..0000000000
--- a/source4/auth/gensec/config.m4
+++ /dev/null
@@ -1,2 +0,0 @@
-SMB_ENABLE(gensec_krb5, $HAVE_KRB5)
-SMB_ENABLE(gensec_gssapi, $HAVE_KRB5)
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
deleted file mode 100644
index 6e86aab34f..0000000000
--- a/source4/auth/gensec/config.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#################################
-# Start SUBSYSTEM gensec
-[LIBRARY::gensec]
-PUBLIC_DEPENDENCIES = \
-		CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT
-# End SUBSYSTEM gensec
-#################################
-
-PC_FILES += $(gensecsrcdir)/gensec.pc
-
-gensec_VERSION = 0.0.1
-gensec_SOVERSION = 0
-gensec_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec.o socket.o)
-
-PUBLIC_HEADERS += $(gensecsrcdir)/gensec.h
-
-$(eval $(call proto_header_template,$(gensecsrcdir)/gensec_proto.h,$(gensec_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE gensec_krb5
-[MODULE::gensec_krb5]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_krb5_init
-PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth_session
-# End MODULE gensec_krb5
-################################################
-
-gensec_krb5_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_krb5.o)
-
-################################################
-# Start MODULE gensec_gssapi
-[MODULE::gensec_gssapi]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_gssapi_init
-PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS 
-# End MODULE gensec_gssapi
-################################################
-
-gensec_gssapi_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_gssapi.o)
-
-################################################
-# Start MODULE cyrus_sasl
-[MODULE::cyrus_sasl]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_sasl_init
-PRIVATE_DEPENDENCIES = CREDENTIALS SASL 
-# End MODULE cyrus_sasl
-################################################
-
-cyrus_sasl_OBJ_FILES = $(addprefix $(gensecsrcdir)/, cyrus_sasl.o)
-
-################################################
-# Start MODULE gensec_spnego
-[MODULE::gensec_spnego]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_spnego_init
-PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS
-# End MODULE gensec_spnego
-################################################
-
-gensec_spnego_OBJ_FILES = $(addprefix $(gensecsrcdir)/, spnego.o) ../libcli/auth/spnego_parse.o
-
-$(eval $(call proto_header_template,$(gensecsrcdir)/spnego_proto.h,$(gensec_spnego_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE gensec_schannel
-[MODULE::gensec_schannel]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_schannel_init
-PRIVATE_DEPENDENCIES = COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR auth_session
-OUTPUT_TYPE = MERGED_OBJ
-# End MODULE gensec_schannel
-################################################
-
-gensec_schannel_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel.o) ../libcli/auth/schannel_sign.o
-$(eval $(call proto_header_template,$(gensecsrcdir)/schannel_proto.h,$(gensec_schannel_OBJ_FILES:.o=.c)))
-
-[PYTHON::pygensec]
-PRIVATE_DEPENDENCIES = gensec PYTALLOC pyparam_util
-LIBRARY_REALNAME = samba/gensec.$(SHLIBEXT)
-
-pygensec_OBJ_FILES = $(gensecsrcdir)/pygensec.o
diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4
deleted file mode 100644
index a8d55a1287..0000000000
--- a/source4/auth/kerberos/config.m4
+++ /dev/null
@@ -1,542 +0,0 @@
-# NOTE! this whole m4 file is disabled in configure.in for now
-
-#################################################
-# KRB5 support
-KRB5_CFLAGS=""
-KRB5_CPPFLAGS=""
-KRB5_LDFLAGS=""
-KRB5_LIBS=""
-with_krb5_support=auto
-krb5_withval=auto
-AC_MSG_CHECKING([for KRB5 support])
-
-# Do no harm to the values of CFLAGS and LIBS while testing for
-# Kerberos support.
-AC_ARG_WITH(krb5,
-[  --with-krb5=base-dir    Locate Kerberos 5 support (default=auto)],
-    	[ case "$withval" in
-		no)
-        		with_krb5_support=no
-        		AC_MSG_RESULT(no)
-        		krb5_withval=no
-			;;
-		yes)
-      			with_krb5_support=yes
-        		AC_MSG_RESULT(yes)
-        		krb5_withval=yes
-			;;
-		auto)
-      			with_krb5_support=auto
-        		AC_MSG_RESULT(auto)
-        		krb5_withval=auto
-			;;
-		*)
-			with_krb5_support=yes
-			AC_MSG_RESULT(yes)
-			krb5_withval=$withval
-			KRB5CONFIG="$krb5_withval/bin/krb5-config"
-        		;;
-	esac ],
-	AC_MSG_RESULT($with_krb5_support)
-)
-
-if test x$with_krb5_support != x"no"; then
-	FOUND_KRB5=no
-	FOUND_KRB5_VIA_CONFIG=no
-
-	#################################################
-	# check for krb5-config from recent MIT and Heimdal kerberos 5
-	AC_MSG_CHECKING(for working specified location for krb5-config)
-	if test x$KRB5CONFIG != "x"; then
-		if test -x "$KRB5CONFIG"; then
-			ac_save_CFLAGS=$CFLAGS
-			CFLAGS="";export CFLAGS
-			ac_save_LDFLAGS=$LDFLAGS
-			LDFLAGS="";export LDFLAGS
-			KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
-			KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-			KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-			CFLAGS=$ac_save_CFLAGS;export CFLAGS
-			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
-			FOUND_KRB5=yes
-			FOUND_KRB5_VIA_CONFIG=yes
-			AC_MSG_RESULT(yes. Found $KRB5CONFIG)
-		else 
-			AC_MSG_RESULT(no. Fallback to specified directory)
-		fi
-	else
-		AC_MSG_RESULT(no. Fallback to finding krb5-config in path)
-		#################################################
-		# check for krb5-config from recent MIT and Heimdal kerberos 5
-		AC_PATH_PROG(KRB5CONFIG, krb5-config)
-		AC_MSG_CHECKING(for working krb5-config in path)
-		if test -x "$KRB5CONFIG"; then
-			ac_save_CFLAGS=$CFLAGS
-			CFLAGS="";export CFLAGS
-			ac_save_LDFLAGS=$LDFLAGS
-			LDFLAGS="";export LDFLAGS
-			KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
-			KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-			KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-			CFLAGS=$ac_save_CFLAGS;export CFLAGS
-			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
-			FOUND_KRB5=yes
-			FOUND_KRB5_VIA_CONFIG=yes
-			AC_MSG_RESULT(yes. Found $KRB5CONFIG)
-		else
-			AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
-		fi
-	fi
-  
-	if test x$FOUND_KRB5 != x"yes"; then
-		#################################################
-		# check for location of Kerberos 5 install
-		AC_MSG_CHECKING(for kerberos 5 install path)
-		case "$krb5_withval" in
-			no)
-				AC_MSG_RESULT(no krb5-path given)
-				;;
-			yes)
-				AC_MSG_RESULT(/usr)
-				FOUND_KRB5=yes
-				;;
-			*)
-				AC_MSG_RESULT($krb5_withval)
-				KRB5_CFLAGS="-I$krb5_withval/include"
-				KRB5_CPPFLAGS="-I$krb5_withval/include"
-				KRB5_LDFLAGS="-L$krb5_withval/lib"
-				FOUND_KRB5=yes
-				;;
-		esac
-	fi
-
-	if test x$FOUND_KRB5 != x"yes"; then
-		#################################################
-		# see if this box has the SuSE location for the heimdal krb implementation
-		AC_MSG_CHECKING(for /usr/include/heimdal)
-		if test -d /usr/include/heimdal; then
-			if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-				KRB5_CFLAGS="-I/usr/include/heimdal"
-				KRB5_CPPFLAGS="-I/usr/include/heimdal"
-				KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
-				AC_MSG_RESULT(yes)
-			else
-				KRB5_CFLAGS="-I/usr/include/heimdal"
-				KRB5_CPPFLAGS="-I/usr/include/heimdal"
-				AC_MSG_RESULT(yes)
-			fi
-		else
-			AC_MSG_RESULT(no)
-		fi
-	fi
-
-	if test x$FOUND_KRB5 != x"yes"; then
-		#################################################
-		# see if this box has the RedHat location for kerberos
-		AC_MSG_CHECKING(for /usr/kerberos)
-		if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
-			KRB5_LDFLAGS="-L/usr/kerberos/lib"
-			KRB5_CFLAGS="-I/usr/kerberos/include"
-			KRB5_CPPFLAGS="-I/usr/kerberos/include"
-			AC_MSG_RESULT(yes)
-		else
-			AC_MSG_RESULT(no)
-		fi
-	fi
-
-	ac_save_CFLAGS=$CFLAGS
-	ac_save_CPPFLAGS=$CPPFLAGS
-	ac_save_LDFLAGS=$LDFLAGS
-
-	#MIT needs this, to let us see 'internal' parts of the headers we use
-	KRB5_CFLAGS="${KRB5_CFLAGS} -DKRB5_PRIVATE -DKRB5_DEPRECATED"
-
-	#Heimdal needs this
-	#TODO: we need to parse KRB5_LIBS for -L path
-	#      and set -Wl,-rpath -Wl,path
-
-	CFLAGS="$CFLAGS $KRB5_CFLAGS"
-	CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
-	LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
-
-	KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
-
-	# now check for krb5.h. Some systems have the libraries without the headers!
-	# note that this check is done here to allow for different kerberos
-	# include paths
-	AC_CHECK_HEADERS(krb5.h)
-
-	if test x"$ac_cv_header_krb5_h" = x"no"; then
-		# Give a warning if KRB5 support was not explicitly requested,
-		# i.e with_krb5_support = auto, otherwise die with an error.
-		if test x"$with_krb5_support" = x"yes"; then
-			AC_MSG_ERROR([KRB5 cannot be supported without krb5.h])
-		else
-			AC_MSG_WARN([KRB5 cannot be supported without krb5.h])
-		fi
-		# Turn off AD support and restore CFLAGS and LIBS variables
-		with_krb5_support="no"
-	fi
-
-	CFLAGS=$ac_save_CFLAGS
-	CPPFLAGS=$ac_save_CPPFLAGS
-	LDFLAGS=$ac_save_LDFLAGS
-fi
-
-# Now we have determined whether we really want KRB5 support
-
-if test x"$with_krb5_support" != x"no"; then
-	ac_save_CFLAGS=$CFLAGS
-	ac_save_CPPFLAGS=$CPPFLAGS
-	ac_save_LDFLAGS=$LDFLAGS
-	ac_save_LIBS=$LIBS
-
-	CFLAGS="$CFLAGS $KRB5_CFLAGS"
-	CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
-	LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
-
-	# now check for gssapi headers.  This is also done here to allow for
-	# different kerberos include paths
-	AC_CHECK_HEADERS(gssapi.h gssapi_krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h com_err.h)
-
-
-	# Heimdal checks.
-	# But only if we didn't have a krb5-config to tell us this already
-	if test x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then
-		##################################################################
-		# we might need the k5crypto and com_err libraries on some systems
- 		AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
-		AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
-
-		AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
-		AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
-		AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
-	fi
-
-	# Heimdal checks. On static Heimdal gssapi must be linked before krb5.
-	AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status,[],[],
-				AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
-
-	########################################################
-	# now see if we can find the krb5 libs in standard paths
-	# or as specified above
-	AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
-	AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_kt_compare)
-
-	########################################################
-	# now see if we can find the gssapi libs in standard paths
-	if test x"$ac_cv_lib_ext_gssapi_gss_display_status" != x"yes"; then
-	   AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
-		AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
-        fi
-
-	AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS) 
-	AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS) 
-	AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS) 
-	AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS) 
-	AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS) 
-	AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_free_data_contents, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_free_unparsed_name, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_free_keytab_entry_contents, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_verify_checksum, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_ticket_get_authorization_data_type, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_c_enctype_compare, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_enctypes_compatible_keys, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_get_error_string, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_free_error_string, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_get_error_message, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_free_error_message, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_initlog, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_addlog_func, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_set_warn_dest, $KRB5_LIBS)
-
-	LIBS="$LIBS $KRB5_LIBS"
-  
-	AC_CACHE_CHECK([for krb5_log_facility type],
-                samba_cv_HAVE_KRB5_LOG_FACILITY,[
-	AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_log_facility block;],
-		samba_cv_HAVE_KRB5_LOG_FACILITY=yes,
-		samba_cv_HAVE_KRB5_LOG_FACILITY=no)])
-
-	if test x"$samba_cv_HAVE_KRB5_LOG_FACILITY" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_LOG_FACILITY,1,
-		[Whether the type krb5_log_facility exists])
-	fi
-
-	AC_CACHE_CHECK([for krb5_encrypt_block type],
-                samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[
-	AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_encrypt_block block;],
-		samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=yes,
-		samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no)])
-
-	if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_ENCRYPT_BLOCK,1,
-		[Whether the type krb5_encrypt_block exists])
-	fi
-
-	AC_CACHE_CHECK([for addrtype in krb5_address],
-		samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_address kaddr; kaddr.addrtype = ADDRTYPE_INET;],
-		samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=yes,
-		samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=no)])
-	if test x"$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" = x"yes"; then
-		AC_DEFINE(HAVE_ADDRTYPE_IN_KRB5_ADDRESS,1,
-		[Whether the krb5_address struct has a addrtype property])
-	fi
-
-	AC_CACHE_CHECK([for addr_type in krb5_address],
-		samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_address kaddr; kaddr.addr_type = KRB5_ADDRESS_INET;],
-		samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=yes,
-		samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=no)])
-	if test x"$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" = x"yes"; then
-		AC_DEFINE(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,1,
-		[Whether the krb5_address struct has a addr_type property])
-	fi
-
-	AC_CACHE_CHECK([for enc_part2 in krb5_ticket], 
-		samba_cv_HAVE_KRB5_TKT_ENC_PART2,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_ticket tkt; tkt.enc_part2->authorization_data[0]->contents = NULL;],
-		samba_cv_HAVE_KRB5_TKT_ENC_PART2=yes,
-		samba_cv_HAVE_KRB5_TKT_ENC_PART2=no)])
-	if test x"$samba_cv_HAVE_KRB5_TKT_ENC_PART2" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_TKT_ENC_PART2,1,
-		[Whether the krb5_ticket struct has a enc_part2 property])
-	fi
-
-	AC_CACHE_CHECK([for keyblock in krb5_creds],
-                 samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS,[
-	AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_creds creds; krb5_keyblock kb; creds.keyblock = kb;],
-		samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=yes,
-		samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no)])
-
-	if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_KEYBLOCK_IN_CREDS,1,
-		[Whether the krb5_creds struct has a keyblock property])
-	fi
-
-	AC_CACHE_CHECK([for session in krb5_creds],
-                 samba_cv_HAVE_KRB5_SESSION_IN_CREDS,[
-	AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_creds creds; krb5_keyblock kb; creds.session = kb;],
-		samba_cv_HAVE_KRB5_SESSION_IN_CREDS=yes,
-		samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no)])
-
-	if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_SESSION_IN_CREDS,1,
-		[Whether the krb5_creds struct has a session property])
-	fi
-
-	AC_CACHE_CHECK([for keyvalue in krb5_keyblock],
-		samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_keyblock key; key.keyvalue.data = NULL;],
-		samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes,
-		samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no)])
-	if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_KEYBLOCK_KEYVALUE,1,
-		[Whether the krb5_keyblock struct has a keyvalue property])
-	fi
-
-	AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC_MD5],
-		samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC_MD5;],
-		samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=yes,
-		samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no)])
-	AC_CACHE_CHECK([for KEYTYPE_ARCFOUR_56],
-                 samba_cv_HAVE_KEYTYPE_ARCFOUR_56,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_keytype keytype; keytype = KEYTYPE_ARCFOUR_56;],
-		samba_cv_HAVE_KEYTYPE_ARCFOUR_56=yes,
-		samba_cv_HAVE_KEYTYPE_ARCFOUR_56=no)])
-	# Heimdals with KEYTYPE_ARCFOUR but not KEYTYPE_ARCFOUR_56 are broken
-	# w.r.t. arcfour and windows, so we must not enable it here
-	if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes" -a\
-	   x"$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" = x"yes"; then
-		AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,1,
-		[Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
-	fi
-
-	AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY],
-		samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_flags ap_options; ap_options = AP_OPTS_USE_SUBKEY;],
-		samba_cv_HAVE_AP_OPTS_USE_SUBKEY=yes,
-		samba_cv_HAVE_AP_OPTS_USE_SUBKEY=no)])
-	if test x"$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" = x"yes"; then
-		AC_DEFINE(HAVE_AP_OPTS_USE_SUBKEY,1,
-		[Whether the AP_OPTS_USE_SUBKEY ap option is available])
-	fi
-
-	AC_CACHE_CHECK([for KV5M_KEYTAB],
-		samba_cv_HAVE_KV5M_KEYTAB,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_keytab_entry entry; entry.magic = KV5M_KEYTAB;],
-		samba_cv_HAVE_KV5M_KEYTAB=yes,
-		samba_cv_HAVE_KV5M_KEYTAB=no)])
-	if test x"$samba_cv_HAVE_KV5M_KEYTAB" = x"yes"; then
-		AC_DEFINE(HAVE_KV5M_KEYTAB,1,
-		[Whether the KV5M_KEYTAB option is available])
-	fi
-
-	AC_CACHE_CHECK([for the krb5_princ_component macro],
-		samba_cv_HAVE_KRB5_PRINC_COMPONENT,[
-		AC_TRY_LINK([#include <krb5.h>],
-		[const krb5_data *pkdata; krb5_context context; krb5_principal principal; 
-			pkdata = krb5_princ_component(context, principal, 0);],
-		samba_cv_HAVE_KRB5_PRINC_COMPONENT=yes,
-		samba_cv_HAVE_KRB5_PRINC_COMPONENT=no)])
-	if test x"$samba_cv_HAVE_KRB5_PRINC_COMPONENT" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_PRINC_COMPONENT,1,
-               [Whether krb5_princ_component is available])
-	fi
-
-	AC_CACHE_CHECK([for key in krb5_keytab_entry],
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_keytab_entry entry; krb5_keyblock e; entry.key = e;],
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=yes,
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no)])
-	if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEY,1,
-		[Whether krb5_keytab_entry has key member])
-	fi
-
-	AC_CACHE_CHECK([for keyblock in krb5_keytab_entry],
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_keytab_entry entry; entry.keyblock.keytype = 0;],
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=yes,
-		samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=no)])
-	if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,1,
-		[Whether krb5_keytab_entry has keyblock member])
-	fi
-
-	AC_CACHE_CHECK([for WRFILE: keytab support],
-                samba_cv_HAVE_WRFILE_KEYTAB,[
-		AC_TRY_RUN([
-		#include<krb5.h>
-		main()
-		{
-			krb5_context context;
-			krb5_keytab keytab;
-			krb5_init_context(&context);
-			return krb5_kt_resolve(context, "WRFILE:api", &keytab);
-		}],
-		samba_cv_HAVE_WRFILE_KEYTAB=yes,
-		samba_cv_HAVE_WRFILE_KEYTAB=no)])
-	if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then
-		AC_DEFINE(HAVE_WRFILE_KEYTAB,1,
-		[Whether the WRFILE:-keytab is supported])
-	fi
-
-	AC_CACHE_CHECK([for krb5_princ_realm returns krb5_realm or krb5_data],
-    		samba_cv_KRB5_PRINC_REALM_RETURNS_REALM,[
-		AC_TRY_COMPILE([#include <krb5.h>],
-		[krb5_context context;krb5_principal principal;krb5_realm realm;
-			realm = *krb5_princ_realm(context, principal);],
-		samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=yes,
-		samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=no)])
-	if test x"$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" = x"yes"; then
-		AC_DEFINE(KRB5_PRINC_REALM_RETURNS_REALM,1,
-		[Whether krb5_princ_realm returns krb5_realm or krb5_data])
-	fi
-
-	# TODO: check all gssapi headers for this
-	AC_CACHE_CHECK([for GSS_C_DCE_STYLE in gssapi.h],
-    		samba_cv_GSS_C_DCE_STYLE,[
-		AC_TRY_COMPILE([#include <gssapi.h>],
-		[int flags = GSS_C_DCE_STYLE;],
-		samba_cv_GSS_C_DCE_STYLE=yes,
-		samba_cv_GSS_C_DCE_STYLE=no)])
-
-	AC_CHECK_FUNC_EXT(gsskrb5_get_initiator_subkey, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(gsskrb5_extract_authz_data_from_sec_context, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(gsskrb5_register_acceptor_identity, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(gss_krb5_ccache_name, $KRB5_LIBS)
-	if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
-		AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
-		AC_MSG_CHECKING(whether KRB5 support is used)
-		SMB_ENABLE(KRB5,YES)
-		AC_MSG_RESULT(yes)
-		echo "KRB5_CFLAGS:   ${KRB5_CFLAGS}"
-		echo "KRB5_CPPFLAGS: ${KRB5_CPPFLAGS}"
-		echo "KRB5_LDFLAGS:  ${KRB5_LDFLAGS}"
-		echo "KRB5_LIBS:     ${KRB5_LIBS}"
-	else
-		if test x"$with_krb5_support" = x"yes"; then
-			AC_MSG_ERROR(a working krb5 library is needed for KRB5 support)
-		else
-			AC_MSG_WARN(a working krb5 library is needed for KRB5 support)
-		fi
-		KRB5_CFLAGS=""
-		KRB5_CPPFLAGS=""
-		KRB5_LDFLAGS=""
-		KRB5_LIBS=""
-		with_krb5_support=no 
-	fi
-
-	# checks if we have access to a libkdc
-	# and can use it for our builtin kdc server_service
-	KDC_CFLAGS=""
-	KDC_CPPFLAGS=""
-	KDC_DLFLAGS=""
-	KDC_LIBS=""
-	AC_CHECK_HEADERS(kdc.h)
-	AC_CHECK_LIB_EXT(kdc, KDC_LIBS, krb5_kdc_default_config)
-	AC_CHECK_LIB_EXT(hdb, KDC_LIBS, hdb_generate_key_set_password)
-
-	AC_MSG_CHECKING(whether libkdc is used)
-	if test x"$ac_cv_header_kdc_h" = x"yes"; then
-		if test x"$ac_cv_lib_ext_kdc_krb5_kdc_default_config" = x"yes"; then
-	   		if test x"$ac_cv_lib_ext_hdb_hdb_generate_key_set_password" = x"yes"; then
-				SMB_ENABLE(KDC,YES)
-				AC_MSG_RESULT(yes)
-				echo "KDC_LIBS:     ${KDC_LIBS}"
-			else
-				AC_MSG_RESULT(no)
-			fi
-		else
-			AC_MSG_RESULT(no)
-		fi
-	else
-		AC_MSG_RESULT(no)
-	fi
-
-	CFLAGS=$ac_save_CFLAGS
-	CPPFLAGS=$ac_save_CPPFLAGS
-	LDFLAGS=$ac_save_LDFLAGS
-	LIBS="$ac_save_LIBS"
-
-	# as a nasty hack add the krb5 stuff to the global vars,
-	# at some point this should not be needed anymore when the build system
-	# can handle that alone
-	CFLAGS="$CFLAGS $KRB5_CFLAGS"
-	CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
-	LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
-fi
-
-SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])
-SMB_EXT_LIB(KDC,[${KDC_LIBS}],[${KDC_CFLAGS}],[${KDC_CPPFLAGS}],[${KDC_LDFLAGS}])
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
deleted file mode 100644
index 609b036b64..0000000000
--- a/source4/auth/kerberos/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#################################
-# Start SUBSYSTEM KERBEROS
-[SUBSYSTEM::KERBEROS]
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE
-PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBTEVENT LIBPACKET LIBNDR
-# End SUBSYSTEM KERBEROS
-#################################
-
-KERBEROS_OBJ_FILES = $(addprefix $(authsrcdir)/kerberos/, \
-	kerberos.o \
-	clikrb5.o \
-	kerberos_heimdal.o \
-	kerberos_pac.o \
-	gssapi_parse.o \
-	krb5_init_context.o \
-	keytab_copy.o)
-
-$(eval $(call proto_header_template,$(authsrcdir)/kerberos/proto.h,$(KERBEROS_OBJ_FILES:.o=.c)))
-
diff --git a/source4/auth/ntlm/config.mk b/source4/auth/ntlm/config.mk
deleted file mode 100644
index 6c75ae842d..0000000000
--- a/source4/auth/ntlm/config.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# NTLM auth server subsystem
-
-#######################
-# Start MODULE auth_sam
-[MODULE::auth_sam_module]
-INIT_FUNCTION = auth_sam_init
-SUBSYSTEM = auth
-PRIVATE_DEPENDENCIES = \
-		SAMDB auth_sam ntlm_check
-# End MODULE auth_sam
-#######################
-
-auth_sam_module_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_sam.o)
-
-#######################
-# Start MODULE auth_anonymous
-[MODULE::auth_anonymous]
-INIT_FUNCTION = auth_anonymous_init
-SUBSYSTEM = auth
-# End MODULE auth_anonymous
-#######################
-
-auth_anonymous_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_anonymous.o)
-
-#######################
-# Start MODULE auth_anonymous
-[MODULE::auth_server]
-INIT_FUNCTION = auth_server_init
-SUBSYSTEM = auth
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_SMB
-# End MODULE auth_server
-#######################
-
-auth_server_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_server.o)
-
-#######################
-# Start MODULE auth_winbind
-[MODULE::auth_winbind]
-INIT_FUNCTION = auth_winbind_init
-SUBSYSTEM = auth
-PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT LIBWBCLIENT
-# End MODULE auth_winbind
-#######################
-
-auth_winbind_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_winbind.o)
-
-#######################
-# Start MODULE auth_developer
-[MODULE::auth_developer]
-INIT_FUNCTION = auth_developer_init
-SUBSYSTEM = auth
-# End MODULE auth_developer
-#######################
-
-auth_developer_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_developer.o)
-
-[MODULE::auth_unix]
-INIT_FUNCTION = auth_unix_init
-SUBSYSTEM = auth
-PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET
-
-auth_unix_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_unix.o)
-
-[SUBSYSTEM::PAM_ERRORS]
-
-#VERSION = 0.0.1
-#SO_VERSION = 0
-PAM_ERRORS_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, pam_errors.o)
-
-[MODULE::auth]
-INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = service
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS UTIL_TEVENT
-
-auth_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth.o auth_util.o auth_simple.o)
-$(eval $(call proto_header_template,$(authsrcdir)/ntlm/auth_proto.h,$(auth_OBJ_FILES:.o=.c)))
-
-# PUBLIC_HEADERS += auth/auth.h
-
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
deleted file mode 100644
index 1be5fa98e7..0000000000
--- a/source4/auth/ntlmssp/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################
-# Start MODULE gensec_ntlmssp
-[MODULE::gensec_ntlmssp]
-SUBSYSTEM = gensec
-INIT_FUNCTION = gensec_ntlmssp_init
-PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS
-OUTPUT_TYPE = MERGED_OBJ
-# End MODULE gensec_ntlmssp
-################################################
-
-gensec_ntlmssp_OBJ_FILES = $(addprefix $(authsrcdir)/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o) 
-
-$(eval $(call proto_header_template,$(authsrcdir)/ntlmssp/proto.h,$(gensec_ntlmssp_OBJ_FILES:.o=.c)))
diff --git a/source4/autogen-autotools.sh b/source4/autogen-autotools.sh
deleted file mode 100755
index 22e35e0316..0000000000
--- a/source4/autogen-autotools.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Run this script to build samba from git.
-
-while true; do
-    case $1 in
-	--version-file)
-	    VERSION_FILE=$2
-	    shift 2
-	    ;;
-	*)
-	    break
-	    ;;
-    esac
-done
-
-## insert all possible names (only works with
-## autoconf 2.x)
-TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253"
-TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253"
-
-AUTOHEADERFOUND="0"
-AUTOCONFFOUND="0"
-
-if which which > /dev/null 2>&1; then
-        echo -n
-else
-	echo "$0: need 'which' to figure out if we have the right autoconf to build samba from git" >&2
-	exit 1
-fi
-##
-## Look for autoheader
-##
-for i in $TESTAUTOHEADER; do
-	if which $i > /dev/null 2>&1; then
-		if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
-			AUTOHEADER=$i
-			AUTOHEADERFOUND="1"
-			break
-		fi
-	fi
-done
-
-##
-## Look for autoconf
-##
-
-for i in $TESTAUTOCONF; do
-	if which $i > /dev/null 2>&1; then
-		if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
-			AUTOCONF=$i
-			AUTOCONFFOUND="1"
-			break
-		fi
-	fi
-done
-
-
-##
-## do we have it?
-##
-if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
-	echo "$0: need autoconf 2.53 or later to build samba from git" >&2
-	exit 1
-fi
-
-echo "$0: running script/mkversion.sh"
-./script/mkversion.sh $VERSION_FILE || exit 1
-
-rm -rf autom4te*.cache
-rm -f configure include/config_tmp.h*
-rm -f makefile Makefile
-
-IPATHS="-I. -I../lib/replace"
-
-echo "$0: running $AUTOHEADER $IPATHS"
-$AUTOHEADER $IPATHS || exit 1
-
-echo "$0: running $AUTOCONF $IPATHS"
-$AUTOCONF $IPATHS || exit 1
-
-rm -rf autom4te*.cache
-
-echo "Now run ./configure (or ./configure.developer) and then make."
-exit 0
diff --git a/source4/build/m4/ax_cflags_gcc_option.m4 b/source4/build/m4/ax_cflags_gcc_option.m4
deleted file mode 100644
index ec01a000aa..0000000000
--- a/source4/build/m4/ax_cflags_gcc_option.m4
+++ /dev/null
@@ -1,109 +0,0 @@
-dnl @synopsis AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
-dnl
-dnl AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
-dnl "checking CFLAGS for gcc -fvomit-frame ... yes" and adds
-dnl the optionflag to CFLAGS if it is understood. You can override
-dnl the shellvar-default of CFLAGS of course. The order of arguments
-dnl stems from the explicit macros like AX_CFLAGS_WARN_ALL.
-dnl
-dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
-dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
-dnl However, if you use this macro in a few places, it would be great
-dnl if you would make up a new function-macro and submit it to the
-dnl ac-archive.
-dnl
-dnl   - $1 option-to-check-for : required ("-option" as non-value)
-dnl   - $2 shell-variable-to-add-to : CFLAGS
-dnl   - $3 action-if-found : add value to shellvariable
-dnl   - $4 action-if-not-found : nothing
-dnl
-dnl note: in earlier versions, $1-$2 were swapped. We try to detect the
-dnl situation and accept a $2=~/-/ as being the old option-to-check-for.
-dnl
-dnl also: there are other variants that emerged from the original macro
-dnl variant which did just test an option to be possibly added. However,
-dnl some compilers accept an option silently, or possibly for just
-dnl another option that was not intended. Therefore, we have to do a
-dnl generic test for a compiler family. For gcc we check "-pedantic"
-dnl being accepted which is also understood by compilers who just want
-dnl to be compatible with gcc even when not being made from gcc sources.
-dnl
-dnl see also:
-dnl       AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
-dnl       AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
-dnl
-dnl @, tested, experimental
-dnl @version $Id: ax_cflags_gcc_option.m4,v 1.5 2003/11/29 08:13:25 guidod Exp $
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl http://ac-archive.sourceforge.net/C_Support/ax_cflags_gcc_option.m4
-dnl
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-dnl -------------------------------------------------------------------------
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
diff --git a/source4/build/m4/ax_cflags_irix_option.m4 b/source4/build/m4/ax_cflags_irix_option.m4
deleted file mode 100644
index f7fe2a19b0..0000000000
--- a/source4/build/m4/ax_cflags_irix_option.m4
+++ /dev/null
@@ -1,174 +0,0 @@
-dnl @synopsis AX_CFLAGS_IRIX_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
-dnl
-dnl AX_CFLAGS_IRIX_OPTION(-go_for_it) would show a message as like
-dnl "checking CFLAGS for irix/cc -go_for_it ... yes" and adds the
-dnl optionflag to CFLAGS if it is understood. You can override the
-dnl shellvar-default of CFLAGS of course. The order of arguments stems
-dnl from the explicit macros like AX_CFLAGS_WARN_ALL.
-dnl
-dnl The cousin AX_CXXFLAGS_IRIX_OPTION would check for an option to add
-dnl to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
-dnl (since it is possible to use different compilers for C and C++).
-dnl
-dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
-dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
-dnl However, if you use this macro in a few places, it would be great
-dnl if you would make up a new function-macro and submit it to the
-dnl ac-archive.
-dnl
-dnl  - $1 option-to-check-for : required ("-option" as non-value)
-dnl  - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
-dnl  - $3 action-if-found : add value to shellvariable
-dnl  - $4 action-if-not-found : nothing
-dnl
-dnl note: in earlier versions, $1-$2 were swapped. We try to detect the
-dnl situation and accept a $2=~/-/ as being the old
-dnl option-to-check-for.
-dnl
-dnl see also: AX_CFLAGS_GCC_OPTION for the widely used original
-dnl variant.
-dnl
-dnl @category C
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @version 2005-01-21
-dnl @license GPLWithACException
-
-AC_DEFUN([AX_CFLAGS_IRIX_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_irix_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for irix/cc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-fullwarn -use_readonly_const % m4_ifval($2,$2,-option)"     dnl IRIX C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_IRIX_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_irix_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for irix/cc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-fullwarn -use_readonly_const % m4_ifval($2,$2,-option)"     dnl IRIX C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl --------------------------------------------------------------------------
-
-AC_DEFUN([AX_CFLAGS_IRIX_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_irix_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for irix/cc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-fullwarn -use_readonly_const % m4_ifval($1,$1,-option)"     dnl IRIX C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_IRIX_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_irix_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for irix/cc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-fullwarn -use_readonly_const % m4_ifval($1,$1,-option)"     dnl IRIX C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-AC_DEFUN([AX_CFLAGS_IRIX_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CFLAGS_IRIX_OPTION_NEW($@)],[AX_CFLAGS_IRIX_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_IRIX_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CXXFLAGS_IRIX_OPTION_NEW($@)],[AX_CXXFLAGS_IRIX_OPTION_OLD($@)])])
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
deleted file mode 100644
index 8149a8ff55..0000000000
--- a/source4/build/m4/check_cc.m4
+++ /dev/null
@@ -1,180 +0,0 @@
-dnl SMB Build Environment CC Checks
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_LIBREPLACE_CC_CHECKS
-
-#
-# Set the debug symbol option if we have
-# --enable-*developer or --enable-debug
-# and the compiler supports it
-#
-if test x$ac_cv_prog_cc_g = xyes -a x$debug = xyes; then
-	CFLAGS="${CFLAGS} -g"
-fi
-
-dnl ###########################################################################
-dnl _AC_LANG_COMPILER_SUNCC
-dnl Check whether the compiler for the current language is really Sun compiler.
-dnl ###########################################################################
-m4_define([AC_LANG_COMPILER_SUNCC],
-[AC_CACHE_CHECK([whether we are really using the Sun _AC_LANG compiler],
-                [ac_cv_[]_AC_LANG_ABBREV[]_compiler_suncc],
-[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __SUNPRO_C
-       choke me
-#endif
-]])],
-                   [ac_compiler_suncc=yes],
-                   [ac_compiler_suncc=no])
-ac_cv_[]_AC_LANG_ABBREV[]_compiler_suncc=$ac_compiler_suncc
-])])
-
-AC_LANG_COMPILER_SUNCC
-
-############################################
-# check if the compiler handles c99 struct initialization
-LIBREPLACE_C99_STRUCT_INIT(samba_cv_c99_struct_initialization=yes,
-		    samba_cv_c99_struct_initialization=no)
-
-if test x"$samba_cv_c99_struct_initialization" != x"yes"; then
-	AC_MSG_WARN([C compiler does not support c99 struct initialization!])
-	AC_MSG_ERROR([Please Install gcc from http://gcc.gnu.org/])
-fi
-
-############################################
-# check if the compiler can handle negative enum values
-# and don't truncate the values to INT_MAX
-# a runtime test is needed here
-AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
-    AC_TRY_RUN(
-[
-	#include <stdio.h>
-	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-	int main(void) {
-		enum negative_values v1 = NEGATIVE_VALUE;
-		unsigned v2 = 0xFFFFFFFF;
-		if (v1 != v2) {
-			printf("v1=0x%08x v2=0x%08x\n", v1, v2);
-			return 1;
-		}
-		return 0;
-	}
-],
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=no,
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes)])
-if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-	AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum support])
-fi
-
-AC_MSG_CHECKING([for test routines])
-AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"],
-	    AC_MSG_RESULT(yes),
-	    AC_MSG_ERROR([cant find test code. Aborting config]),
-	    AC_MSG_WARN([cannot run when cross-compiling]))
-
-#
-# Check if the compiler support ELF visibility for symbols
-#
-
-visibility_attribute=no
-VISIBILITY_CFLAGS=""
-if test x"$GCC" = x"yes" ; then
-	AX_CFLAGS_GCC_OPTION([-fvisibility=hidden], VISIBILITY_CFLAGS)
-fi
-
-if test -n "$VISIBILITY_CFLAGS"; then
-	AC_MSG_CHECKING([whether the C compiler supports the visibility attribute])
-	OLD_CFLAGS="$CFLAGS"
-
-	CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
-	AC_TRY_LINK([
-		void vis_foo1(void) {}
-		__attribute__((visibility("default"))) void vis_foo2(void) {}
-	],[
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_VISIBILITY_ATTR,1,[Whether the C compiler supports the visibility attribute])
-		visibility_attribute=yes
-	],[
-		AC_MSG_RESULT(no)
-	])
-	CFLAGS="$OLD_CFLAGS"
-fi
-AC_SUBST(visibility_attribute)
-
-#
-# Check if the compiler can handle the options we selected by
-# --enable-*developer
-#
-DEVELOPER_CFLAGS=""
-if test x$developer = xyes; then
-    	OLD_CFLAGS="${CFLAGS}"
-
-	CFLAGS="${CFLAGS} -D_SAMBA_DEVELOPER_DONNOT_USE_O2_"
-	DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
-	if test x"$GCC" = x"yes" ; then
-	    #
-	    # warnings we want...
-	    #
-	    AX_CFLAGS_GCC_OPTION(-Wall, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wshadow, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wstrict-prototypes, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wpointer-arith, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wcast-qual, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wcast-align, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wwrite-strings, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wmissing-format-attribute, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wformat=2, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wdeclaration-after-statement, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wunused-macros, DEVELOPER_CFLAGS)
-#	    AX_CFLAGS_GCC_OPTION(-Wextra, DEVELOPER_CFLAGS)
-#	    AX_CFLAGS_GCC_OPTION(-Wc++-compat, DEVELOPER_CFLAGS)
-#	    AX_CFLAGS_GCC_OPTION(-Wmissing-prototypes, DEVELOPER_CFLAGS)
-#	    AX_CFLAGS_GCC_OPTION(-Wmissing-declarations, DEVELOPER_CFLAGS)
-#	    AX_CFLAGS_GCC_OPTION(-Wmissing-field-initializers, DEVELOPER_CFLAGS)
-	    #
-	    # warnings we don't want...
-	    #
-	    AX_CFLAGS_GCC_OPTION(-Wno-format-y2k, DEVELOPER_CFLAGS)
-	    AX_CFLAGS_GCC_OPTION(-Wno-unused-parameter, DEVELOPER_CFLAGS)
-	    #
-	    # warnings we don't want just for some files e.g. swig bindings
-	    #
-	    AX_CFLAGS_GCC_OPTION(-Wno-cast-qual, CFLAG_NO_CAST_QUAL)
-	    AC_SUBST(CFLAG_NO_CAST_QUAL)
-	    AX_CFLAGS_GCC_OPTION(-Wno-unused-macros, CFLAG_NO_UNUSED_MACROS)
-	    AC_SUBST(CFLAG_NO_UNUSED_MACROS)
-	elif test x"$ac_cv_c_compiler_suncc" != x"yes"; then
-	    AX_CFLAGS_IRIX_OPTION(-fullwarn, DEVELOPER_CFLAGS)
-	fi
-
-    	CFLAGS="${OLD_CFLAGS}"
-fi
-if test -n "$DEVELOPER_CFLAGS"; then
-	OLD_CFLAGS="${CFLAGS}"
-	CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"
-	AC_MSG_CHECKING([that the C compiler can use the DEVELOPER_CFLAGS])
-	AC_TRY_COMPILE([],[],
-		AC_MSG_RESULT(yes),
-		DEVELOPER_CFLAGS=""; AC_MSG_RESULT(no))
-	CFLAGS="${OLD_CFLAGS}"
-fi
-
-# allow for --with-hostcc=gcc
-AC_ARG_WITH(hostcc,[  --with-hostcc=compiler  choose host compiler],
-[HOSTCC=$withval],
-[
-if test z"$cross_compiling" = "yes"; then 
-	HOSTCC=cc
-else 
-	HOSTCC=$CC
-fi
-])
-AC_SUBST(HOSTCC)
-
-AC_PATH_PROG(GCOV,gcov)
diff --git a/source4/build/m4/check_doc.m4 b/source4/build/m4/check_doc.m4
deleted file mode 100644
index 2aaf9596de..0000000000
--- a/source4/build/m4/check_doc.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_PATH_PROG(XSLTPROC, xsltproc)
diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
deleted file mode 100644
index 48d6b333ef..0000000000
--- a/source4/build/m4/check_ld.m4
+++ /dev/null
@@ -1,187 +0,0 @@
-dnl SMB Build Environment LD Checks
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-dnl  Copyright (C) Jelmer Vernooij 2006
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_PATH_PROG(PROG_LD,ld)
-LD=${PROG_LD}
-AC_PROG_LD_GNU
-LD=""
-
-AC_SUBST(BLDSHARED)
-AC_SUBST(LD)
-AC_SUBST(SYS_LDFLAGS)
-AC_SUBST(LDFLAGS)
-
-# Assume non-shared by default and override below
-# these are the defaults, good for lots of systems
-BLDSHARED="false"
-LD="${CC}"
-PICFLAG=""
-
-# allow for --with-hostld=gcc
-AC_ARG_WITH(hostld,[  --with-hostld=linker    choose host linker],
-[HOSTLD=$withval],
-[HOSTLD=$HOSTCC])
-
-AC_MSG_CHECKING([whether to try to build shared libraries on $host_os])
-
-# and these are for particular systems
-case "$host_os" in
-	*linux*)
-		BLDSHARED="true"
-		SYS_LDFLAGS="-Wl,--export-dynamic"
-		;;
-	*solaris*)
-		BLDSHARED="true"
-		if test "${GCC}" = "yes"; then
-			if test "${ac_cv_prog_gnu_ld}" = "yes"; then
-				SYS_LDFLAGS="-Wl,-E"
-			fi
-		fi
-		;;
-	*sunos*)
-		BLDSHARED="true"
-		;;
-	*netbsd* | *freebsd* | *dragonfly* )  
-		BLDSHARED="true"
-		SYS_LDFLAGS="-Wl,--export-dynamic"
-		;;
-	*openbsd*)
-		BLDSHARED="true"
-		SYS_LDFLAGS="-Wl,-Bdynamic"
-		;;
-	*irix*)
-		BLDSHARED="true"
-		;;
-	*aix*)
-		BLDSHARED="true"
-		SYS_LDFLAGS="-Wl,-brtl,-bexpall,-bbigtoc"
-		;;
-	*hpux*)
-		# Use special PIC flags for the native HP-UX compiler.
-		BLDSHARED="true" # I hope this is correct
-		if test "$host_cpu" = "ia64"; then
-			SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
-		else
-			SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib:/usr/lib"
-		fi
-		;;
-	*osf*)
-		BLDSHARED="true"
-		;;
-	*unixware*)
-		BLDSHARED="true"
-		;;
-	*darwin*)
-		BLDSHARED="true"
-		;;
-esac
-
-AC_MSG_RESULT($BLDSHARED)
-
-AC_MSG_CHECKING([LD])
-AC_MSG_RESULT([$LD])
-AC_MSG_CHECKING([LDFLAGS])
-AC_MSG_RESULT([$LDFLAGS])
-AC_MSG_CHECKING([SYS_LDFLAGS])
-AC_MSG_RESULT([$SYS_LDFLAGS])
-
-AC_SUBST(HOSTLD)
-
-AC_LIBREPLACE_STLD
-AC_LIBREPLACE_STLD_FLAGS
-
-AC_MSG_CHECKING([STLD])
-AC_MSG_RESULT([$STLD])
-AC_MSG_CHECKING([STLD_FLAGS])
-AC_MSG_RESULT([$STLD_FLAGS])
-
-AC_LD_PICFLAG
-AC_LD_EXPORT_DYNAMIC
-AC_LD_SHLIBEXT
-AC_LD_SONAMEFLAG
-AC_LIBREPLACE_SHLD
-AC_LIBREPLACE_SHLD_FLAGS
-AC_LIBREPLACE_MDLD
-AC_LIBREPLACE_MDLD_FLAGS
-AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
-
-#######################################################
-# test whether building a shared library actually works
-if test $BLDSHARED = true; then
-
-	AC_MSG_CHECKING([SHLD])
-	AC_MSG_RESULT([$SHLD])
-	AC_MSG_CHECKING([SHLD_FLAGS])
-	AC_MSG_RESULT([$SHLD_FLAGS])
-
-	AC_MSG_CHECKING([MDLD])
-	AC_MSG_RESULT([$MDLD])
-	AC_MSG_CHECKING([MDLD_FLAGS])
-	AC_MSG_RESULT([$MDLD_FLAGS])
-
-	AC_MSG_CHECKING([SHLIBEXT])
-	AC_MSG_RESULT([$SHLIBEXT])
-	AC_MSG_CHECKING([SONAMEFLAG])
-	AC_MSG_RESULT([$SONAMEFLAG])
-
-	AC_MSG_CHECKING([PICFLAG])
-	AC_MSG_RESULT([$PICFLAG])
-
-	AC_CACHE_CHECK([whether building shared libraries actually works], 
-	               [ac_cv_shlib_works],[
-			ac_cv_shlib_works=no
-			# try building a trivial shared library
-			# TODO: also test SONAMEFLAG
-			${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/../tests/shlib.c -o shlib.o &&
-				${SHLD} ${SHLD_FLAGS} -o shlib.${SHLIBEXT} shlib.o && 
-				ac_cv_shlib_works=yes
-			rm -f shlib.${SHLIBEXT} shlib.o
-	])
-	AC_CACHE_CHECK([whether building shared modules actually works], 
-	               [ac_cv_shmod_works],[
-			ac_cv_shmod_works=no
-			# try building a trivial shared library
-			${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/../tests/shlib.c -o shlib.o &&
-				${MDLD} ${MDLD_FLAGS} -o shlib.${SHLIBEXT} shlib.o && 
-				ac_cv_shmod_works=yes
-			rm -f shlib.${SHLIBEXT} shlib.o
-	])
-	if test $ac_cv_shlib_works = no; then
-		AC_MSG_ERROR(unable to build shared libraries)
-	fi
-	if test $ac_cv_shmod_works = no; then
-		AC_MSG_ERROR(unable to build shared modules)
-	fi
-fi
-
-AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
-
-AC_MSG_CHECKING([if we can link using the selected flags])
-AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"],
-	    AC_MSG_RESULT(yes),
-	    AC_MSG_ERROR([we cannot link with the selected cc and ld flags. Aborting configure]),
-	    AC_MSG_WARN([cannot run when cross-compiling]))
-
-
-USESHARED=false
-AC_SUBST(USESHARED)
-
-AC_ARG_ENABLE(dso,
-[  --enable-dso 	          Enable using shared libraries internally (experimental)],
-[],[enable_dso=no])
-
-if test x"$enable_dso" = x"yes" -a x"$BLDSHARED" != x"true"; then
-	AC_MSG_ERROR([--enable-dso: no support for shared libraries])
-fi
-
-if test x"$enable_dso" != x"no"; then
-	USESHARED=$BLDSHARED
-fi
-
-AC_MSG_CHECKING([if binaries will use shared libraries])
-AC_MSG_RESULT([$USESHARED])
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
deleted file mode 100644
index fb6b8aa804..0000000000
--- a/source4/build/m4/check_path.m4
+++ /dev/null
@@ -1,233 +0,0 @@
-dnl SMB Build Environment Path Checks
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_LIBREPLACE_LOCATION_CHECKS
-
-#################################################
-# Directory handling stuff to support both the
-# legacy SAMBA directories and FHS compliant
-# ones...
-AC_PREFIX_DEFAULT(/usr/local/samba)
-
-# Defaults and --without-fhs
-logfilebase="${localstatedir}"
-lockdir="${localstatedir}/locks"
-piddir="${localstatedir}/run"
-privatedir="\${prefix}/private"
-modulesdir="\${prefix}/modules"
-winbindd_socket_dir="${localstatedir}/run/winbindd"
-winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged"
-ntp_signd_socket_dir="${localstatedir}/run/ntp_signd"
-
-AC_ARG_ENABLE(fhs, 
-[AS_HELP_STRING([--enable-fhs],[Use FHS-compliant paths (default=no)])],
-[fhs=$enableval],
-[fhs=no]
-)
-
-if test x$fhs = xyes; then
-    lockdir="${localstatedir}/lib/samba"
-    piddir="${localstatedir}/run/samba"
-    logfilebase="${localstatedir}/log/samba"
-    privatedir="${localstatedir}/lib/samba/private"
-    sysconfdir="${sysconfdir}/samba"
-    modulesdir="${libdir}/samba"
-    datadir="${datadir}/samba"
-    includedir="${includedir}/samba-4.0"
-    ntp_signd_socket_dir="${localstatedir}/run/samba/ntp_signd"
-    winbindd_socket_dir="${localstatedir}/run/samba/winbindd"
-    winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged"
-else
-	# Check to prevent installing directly under /usr without the FHS
-	AS_IF([test $prefix = /usr || test $prefix = /usr/local],[
-		AC_MSG_ERROR([Don't install directly under "/usr" or "/usr/local" without using the FHS option (--enable-fhs). This could lead to file loss!])
-	])
-fi
-
-#################################################
-# set modules directory location
-AC_ARG_WITH(modulesdir,
-[AS_HELP_STRING([--with-modulesdir=DIR],[Where to put dynamically loadable modules ($modulesdir)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-modulesdir called without argument - will use default])
-  ;;
-  * )
-    modulesdir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set private directory location
-AC_ARG_WITH(privatedir,
-[AS_HELP_STRING([--with-privatedir=DIR],[Where to put sam.ldb and other private files containing key material ($ac_default_prefix/private)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-privatedir called without argument - will use default])
-  ;;
-  * )
-    privatedir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set where the winbindd socket should be put
-AC_ARG_WITH(winbindd-socket-dir,
-[AS_HELP_STRING([--with-winbindd-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_socket_dir)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-winbind-socketdir called without argument - will use default])
-  ;;
-  * )
-    winbindd_socket_dir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set where the winbindd privileged socket should be put
-AC_ARG_WITH(winbindd-privileged-socket-dir,
-[AS_HELP_STRING([--with-winbindd-privileged-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_privileged_socket_dir)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-winbind-privileged-socketdir called without argument - will use default])
-  ;;
-  * )
-    winbindd_privileged_socket_dir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set where the NTP signing deamon socket should be put
-AC_ARG_WITH(ntp-signd-socket-dir,
-[AS_HELP_STRING([--with-ntp-signd-socket-dir=DIR],[Where to put the NTP signing deamon socket ($ac_default_prefix/run/ntp_signd)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-ntp-signd-socketdir called without argument - will use default])
-  ;;
-  * )
-    ntp_signd_socket_dir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set lock directory location
-AC_ARG_WITH(lockdir,
-[AS_HELP_STRING([--with-lockdir=DIR],[Where to put lock files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-lockdir called without argument - will use default])
-  ;;
-  * )
-    lockdir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set pid directory location
-AC_ARG_WITH(piddir,
-[AS_HELP_STRING([--with-piddir=DIR],[Where to put pid files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-piddir called without argument - will use default])
-  ;;
-  * )
-    piddir="$withval"
-    ;;
-  esac])
-
-#################################################
-# set log directory location
-AC_ARG_WITH(logfilebase,
-[AS_HELP_STRING([--with-logfilebase=DIR],[Where to put log files (\$(VARDIR))])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody does it
-  #
-    AC_MSG_WARN([--with-logfilebase called without argument - will use default])
-  ;;
-  * )
-    logfilebase="$withval"
-    ;;
-  esac])
-
-
-AC_SUBST(lockdir)
-AC_SUBST(piddir)
-AC_SUBST(logfilebase)
-AC_SUBST(privatedir)
-AC_SUBST(bindir)
-AC_SUBST(sbindir)
-AC_SUBST(winbindd_socket_dir)
-AC_SUBST(winbindd_privileged_socket_dir)
-AC_SUBST(ntp_signd_socket_dir)
-AC_SUBST(modulesdir)
-
-#################################################
-# set prefix for 'make test'
-# this is needed to workarround the 108 char 
-# unix socket path limitation!
-#
-selftest_prefix="./st"
-AC_SUBST(selftest_prefix)
-AC_ARG_WITH(selftest-prefix,
-[AS_HELP_STRING([--with-selftest-prefix=DIR],[The prefix where make test will be run ($selftest_prefix)])],
-[ case "$withval" in
-  yes|no)
-    AC_MSG_WARN([--with-selftest-prefix called without argument - will use default])
-  ;;
-  * )
-    selftest_prefix="$withval"
-    ;;
-  esac])
-
-debug=no
-AC_ARG_ENABLE(debug,
-[AS_HELP_STRING([--enable-debug],[Turn on compiler debugging information (default=no)])],
-    [if test x$enable_debug = xyes; then
-        debug=yes
-    fi])
-
-developer=no
-AC_SUBST(developer)
-AC_ARG_ENABLE(developer,
-[AS_HELP_STRING([--enable-developer],[Turn on developer warnings and debugging (default=no)])],
-    [if test x$enable_developer = xyes; then
-	debug=yes
-        developer=yes
-    fi])
-
-dnl disable these external libs 
-AC_ARG_WITH(disable-ext-lib,
-[AS_HELP_STRING([--with-disable-ext-lib=LIB],[Comma-seperated list of external libraries])],
-[ if test $withval; then
-	for i in `echo $withval | sed -e's/,/ /g'`
-	do
-		eval SMB_$i=NO
-	done
-fi ])
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
deleted file mode 100644
index 738ab8b1ae..0000000000
--- a/source4/build/m4/env.m4
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl SMB Build Environment Checks
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-dnl  Copyright (C) Jelmer Vernooij 2005,2008
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_SUBST(srcdir)
-export srcdir;
-
-# we always set builddir to "." as that's nicer than
-# having the absolute path of the current work directory
-builddir=.
-AC_SUBST(builddir)
-export builddir;
-
-AC_SUBST(datarootdir)
-
-AC_SUBST(VPATH)
-VPATH="\$(builddir):\$(srcdir)"
-
-SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
-echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
-
-SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then
-	echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
-fi
-SAMBA_VERSION_GIT_COMMIT_DATE=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then
-	echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}"
-fi
-SAMBA_VERSION_GIT_COMMIT_TIME=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
-	echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
-
-	# just to keep the build-farm gui happy for now...
-	echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
-fi
-
-m4_include(build/m4/check_path.m4)
-m4_include(../m4/check_perl.m4)
-
-AC_SAMBA_PERL([], [AC_MSG_ERROR([Please install perl from http://www.perl.com/])])
-
-AC_PATH_PROG(YAPP, yapp, false)
-
-m4_include(build/m4/check_cc.m4)
-m4_include(build/m4/check_ld.m4)
-m4_include(../m4/check_make.m4)
-
-AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])])
-AC_SAMBA_GNU_MAKE_VERSION()
-GNU_MAKE_VERSION=$samba_cv_gnu_make_version
-AC_SUBST(GNU_MAKE_VERSION)
-
-new_make=no
-AC_MSG_CHECKING([for GNU make >= 3.81])
-if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
-	new_make=yes
-fi
-AC_MSG_RESULT($new_make)
-automatic_dependencies=no
-AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])
-AC_MSG_CHECKING([Whether to use automatic dependencies])
-AC_ARG_ENABLE(automatic-dependencies,
-[  --enable-automatic-dependencies Enable automatic dependencies],
-[ automatic_dependencies=$enableval ], 
-[ automatic_dependencies=no ])
-AC_MSG_RESULT($automatic_dependencies)
-AC_SUBST(automatic_dependencies)
-
-m4_include(build/m4/check_doc.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)
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
deleted file mode 100644
index c08e2e78bb..0000000000
--- a/source4/build/m4/public.m4
+++ /dev/null
@@ -1,282 +0,0 @@
-dnl SMB Build System
-dnl ----------------
-dnl Copyright (C) 2004 Stefan Metzmacher
-dnl Copyright (C) 2004-2005 Jelmer Vernooij
-dnl Published under the GPL
-dnl
-dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-dnl
-dnl SMB_INCLUDED_LIB_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-dnl
-dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
-dnl
-dnl SMB_ENABLE(name,default_build)
-dnl
-dnl SMB_INCLUDE_MK(file)
-dnl
-dnl SMB_WRITE_MAKEVARS(file)
-dnl
-dnl SMB_WRITE_PERLVARS(file)
-dnl
-dnl #######################################################
-dnl ### And now the implementation			###
-dnl #######################################################
-
-dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags)
-AC_DEFUN([SMB_SUBSYSTEM],
-[
-MAKE_SETTINGS="$MAKE_SETTINGS
-$1_CFLAGS = $4
-$1_ENABLE = YES
-$1_OBJ_FILES = $2
-"
-
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
-###################################
-# Start Subsystem $1
-@<:@SUBSYSTEM::$1@:>@
-PRIVATE_DEPENDENCIES = $3
-CFLAGS = \$($1_CFLAGS)
-ENABLE = YES
-# End Subsystem $1
-###################################
-"
-])
-
-dnl SMB_BUILD_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags,realname)
-AC_DEFUN([SMB_BUILD_LIBRARY],
-[
-MAKE_SETTINGS="$MAKE_SETTINGS
-$1_CFLAGS = $4
-$1_LDFLAGS = $5
-n1_ENABLE = YES
-$1_OBJ_FILES = $2
-"
-
-SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
-###################################
-# Start Library $1
-@<:@LIBRARY::$1@:>@
-PRIVATE_DEPENDENCIES = $3
-CFLAGS = \$($1_CFLAGS)
-LDFLAGS = \$($1_LDFLAGS)
-ENABLE = YES
-ifelse([$6], [], [], [LIBRARY_REALNAME = $6])
-# End Library $1
-###################################
-"
-])
-
-dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], 
-[
-	dnl Figure out the correct variables and call SMB_EXT_LIB()
-
-	if test -z "$PKG_CONFIG"; then
-		AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-	fi
-
-	if test "$PKG_CONFIG" = "no" ; then
-		echo "*** The pkg-config script could not be found. Make sure it is"
-		echo "*** in your path, or set the PKG_CONFIG environment variable"
-		echo "*** to the full path to pkg-config."
-		echo "*** Or see http://pkg-config.freedesktop.org/ to get pkg-config."
-			ac_cv_$1_found=no
-	else
-		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
-		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-			AC_MSG_CHECKING(for $2)
-
-			if $PKG_CONFIG --exists '$2' ; then
-				AC_MSG_RESULT(yes)
-
-				$1_CFLAGS="`$PKG_CONFIG --cflags '$2'`"
-				OLD_CFLAGS="$CFLAGS"
-				CFLAGS="$CFLAGS $$1_CFLAGS"
-				AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS])
-				AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"],
-					SMB_ENABLE($1, YES)
-					AC_MSG_RESULT(yes),
-					AC_MSG_RESULT(no),
-					AC_MSG_WARN([cannot run when cross-compiling]))
-				CFLAGS="$OLD_CFLAGS"
-
-				ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`"
-				LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other)
-				ac_cv_$1_includedir_only="`$PKG_CONFIG --cflags-only-I '$2'`"
-				CFLAGS_REMOVE_USR_INCLUDE(ac_cv_$1_includedir_only)
-				SMB_EXT_LIB($1, 
-					[`$PKG_CONFIG --libs-only-l '$2'`], 
-					[`$PKG_CONFIG --cflags-only-other '$2'`],
-					[$ac_cv_$1_includedir_only],
-					[$ac_cv_$1_libs_only_other])
-				ac_cv_$1_found=yes
-
-			else
-				AC_MSG_RESULT(no)
-				$PKG_CONFIG --errors-to-stdout --print-errors '$2'
-				ac_cv_$1_found=no
-			fi
-		else
-			echo "*** Your version of pkg-config is too old. You need version $SAMBA_PKG_CONFIG_MIN_VERSION or newer."
-			echo "*** See http://pkg-config.freedesktop.org/"
-			ac_cv_$1_found=no
-		fi
-	fi
-	if test x$ac_cv_$1_found = x"yes"; then
-		ifelse([$3], [], [echo -n ""], [$3])
-	else
-		ifelse([$4], [], [
-			  SMB_EXT_LIB($1)
-			  SMB_ENABLE($1, NO)
-		], [$4])
-	fi
-])
-
-dnl SMB_INCLUDED_LIB_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-AC_DEFUN([SMB_INCLUDED_LIB_PKGCONFIG],
-[
-	AC_ARG_ENABLE([external-]translit($1,`A-Z',`a-z'),
-		AS_HELP_STRING([--enable-external-]translit($1,`A-Z',`a-z'), [Use external $1 instead of built-in (default=ifelse([$5],[],auto,$5))]), [], [enableval=ifelse([$5],[],auto,$5)])
-
-	if test $enableval = yes -o $enableval = auto; then
-		SMB_EXT_LIB_FROM_PKGCONFIG([$1], [$2], [$3], [
-			if test $enableval = yes; then
-				AC_MSG_ERROR([Unable to find external $1])
-			fi
-			enableval=no
-		])
-	fi
-	if test $enableval = no; then
-		ifelse([$4], [], [
-			  SMB_EXT_LIB($1)
-			  SMB_ENABLE($1, NO)
-		], [$4])
-	fi
-])
-
-dnl SMB_INCLUDE_MK(file)
-AC_DEFUN([SMB_INCLUDE_MK],
-[
-SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
-mkinclude $1
-"
-])
-
-dnl
-dnl SMB_EXT_LIB() just specifies the details of the library.
-dnl Note: the library isn't enabled by default.
-dnl You need to enable it with SMB_ENABLE(name) if configure
-dnl find it should be used. E.g. it should not be enabled
-dnl if the library is present, but the header file is missing.
-dnl
-dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
-AC_DEFUN([SMB_EXT_LIB],
-[
-MAKE_SETTINGS="$MAKE_SETTINGS
-$1_LIBS = $2
-$1_CFLAGS = $3
-$1_CPPFLAGS = $4
-$1_LDFLAGS = $5
-"
-
-])
-
-dnl SMB_ENABLE(name,default_build)
-AC_DEFUN([SMB_ENABLE],
-[
-	MAKE_SETTINGS="$MAKE_SETTINGS
-$1_ENABLE = $2
-"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-\$enabled{\"$1\"} = \"$2\";"
-])
-
-dnl SMB_MAKE_SETTINGS(text)
-AC_DEFUN([SMB_MAKE_SETTINGS],
-[
-MAKE_SETTINGS="$MAKE_SETTINGS
-$1
-"
-])
-
-dnl SMB_WRITE_MAKEVARS(path, skip_vars)
-AC_DEFUN([SMB_WRITE_MAKEVARS],
-[
-echo "configure: creating $1"
-cat >$1<<CEOF
-# $1 - Autogenerated by configure, DO NOT EDIT!
-$MAKE_SETTINGS
-CEOF
-skip_vars=" $2 "
-for ac_var in $ac_subst_vars
-do
-    eval ac_val=\$$ac_var
-	if echo "$skip_vars" | grep -v " $ac_var " >/dev/null 2>/dev/null; then
-		echo "$ac_var = $ac_val" >> $1
-	fi
-done
-])
-
-dnl SMB_WRITE_PERLVARS(path)
-AC_DEFUN([SMB_WRITE_PERLVARS],
-[
-echo "configure: creating $1"
-cat >$1<<CEOF
-# config.pm - Autogenerate by configure. DO NOT EDIT!
-
-package config;
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(%enabled %config);
-use strict;
-
-use vars qw(%enabled %config);
-
-%config = (
-CEOF
-
-for ac_var in $ac_subst_vars
-do
-	eval ac_val=\$$ac_var
-	# quote ' (\x27) inside '...' and make sure \ isn't eaten by shells, so use perl:
-	QAC_VAL=$ac_val QAC_VAR=$ac_var perl -e '$myval="$ENV{QAC_VAL}"; $myval =~ s/\x27/\\\x27/g ; print $ENV{QAC_VAR}." => \x27$myval\x27,\n"' >> $1
-done
-
-cat >>$1<<CEOF
-);
-$SMB_INFO_ENABLES
-1;
-CEOF
-])
-
-dnl SMB_BUILD_RUN(OUTPUT_FILE)
-AC_DEFUN([SMB_BUILD_RUN],
-[
-AC_OUTPUT_COMMANDS(
-[
-test "x$ac_abs_srcdir" != "x$ac_abs_builddir" && (
-	cd $builddir;
-	# NOTE: We *must* use -R so we don't follow symlinks (at least on BSD
-	# systems).
-	test -d heimdal || cp -R $srcdir/heimdal $builddir/
-	test -d heimdal_build || cp -R $srcdir/heimdal_build $builddir/
-	test -d build || builddir="$builddir" \
-			srcdir="$srcdir" \
-			$PERL ${srcdir}/script/buildtree.pl
- )
-
-$PERL -I${builddir} -I${builddir}/build \
-    -I${srcdir} -I${srcdir}/build \
-    ${srcdir}/build/smb_build/main.pl --output=$1 main.mk || exit $?
-],
-[
-srcdir="$srcdir"
-builddir="$builddir"
-PERL="$PERL"
-
-export PERL
-export srcdir
-export builddir
-])
-])
diff --git a/source4/build/make/lex_compile.sh b/source4/build/make/lex_compile.sh
deleted file mode 100755
index d05056d100..0000000000
--- a/source4/build/make/lex_compile.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-LEX="$1"
-SRC="$2"
-DEST="$3"
-shift 3
-ARGS="$*"
-
-dir=`dirname $SRC`
-file=`basename $SRC`
-base=`basename $SRC .l`
-if [ -z "$LEX" ]; then
-	# if $DEST is more recent than $SRC, we can just touch
-	# otherwise we touch but print out warnings
-	if [ -r $DEST ]; then
-		if [ x`find $SRC -newer $DEST -print` = x$SRC ]; then
-			echo "warning: lex not found - cannot generate $SRC => $DEST" >&2
-			echo "warning: lex not found - only updating the timestamp of $DEST" >&2
-		fi
-		touch $DEST;
-		exit;
-	fi
-	echo "error: lex not found - cannot generate $SRC => $DEST" >&2
-	exit 1;
-fi
-# if $DEST is more recent than $SRC, we can just touch
-if [ -r $DEST ]; then
-	if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
-		touch $DEST;
-		exit;
-	fi
-fi
-TOP=`pwd`
-echo "info: running $LEX $ARGS $file"
-if cd $dir && $LEX $ARGS $file; then
-	if [ -r lex.yy.c ];then
-	        # we must guarantee that config.h comes first
-		echo "info: move lex.yy.c to $base.c"
-	        echo "#include \"config.h\"" > $base.c
-		sed -e "s|lex\.yy\.c|$DEST|" lex.yy.c >> $base.c
-		rm -f $base.yy.c
-	elif [ -r $base.yy.c ];then
-	        # we must guarantee that config.h comes first
-		echo "info: move $base.yy.c to $base.c"
-	        echo "#include \"config.h\"" > $base.c
-		sed -e "s|$base\.yy\.c|$DEST|" $base.yy.c >> $base.c
-		rm -f $base.yy.c
-	elif [ -r $base.c ];then
-	        # we must guarantee that config.h comes first
-		echo "info: add #include \"config.h\" to $base.c"
-		mv $base.c $base.c.tmp
-	        echo "#include \"config.h\"" > $base.c
-		sed -e "s|$base\.yy\.c|$DEST|" $base.c.tmp >> $base.c
-		rm -f $base.c.tmp
-	elif [ ! -r base.c ]; then
-		echo "$base.c nor $base.yy.c nor lex.yy.c generated."
-		exit 1
-	fi
-fi
-cd $TOP
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
deleted file mode 100644
index ea307da73d..0000000000
--- a/source4/build/make/python.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-pythonbuilddir = bin/python
-
-installpython::
-	mkdir -p $(DESTDIR)$(pythondir)
-
-# Install Python
-# Arguments: Module path
-define python_module_template
-
-installpython:: $$(pythonbuilddir)/$(1) ;
-	mkdir -p $$(DESTDIR)$$(pythondir)/$$(dir $(1))
-	cp $$< $$(DESTDIR)$$(pythondir)/$(1)
-
-uninstallpython:: 
-	rm -f $$(DESTDIR)$$(pythondir)/$(1) ;
-
-pythonmods:: $$(pythonbuilddir)/$(1) ;
-
-endef
-
-define python_py_module_template
-
-$$(pythonbuilddir)/$(1): $(2) ;
-	mkdir -p $$(@D)
-	cp $$< $$@
-
-$(call python_module_template,$(1))
-
-endef
-
-# Python C module
-# Arguments: File name, dependencies, link list
-define python_c_module_template
-
-$$(pythonbuilddir)/$(1): $(2) ; 
-	@echo Linking $$@
-	@mkdir -p $$(@D)
-	@$$(MDLD) $$(LDFLAGS) $$(MDLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
-
-$(call python_module_template,$(1))
-endef
-
-pythonmods::
-
-clean::
-	@echo "Removing python modules"
-	@rm -rf $(pythonbuilddir)
-
-bin/python/%.py: 
-	mkdir -p $(@D)
-	cp $< $@
diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
deleted file mode 100644
index 30622cc89b..0000000000
--- a/source4/build/make/rules.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# Rules file for Samba 4
-# This relies on GNU make.
-#
-# Dependencies command
-DEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ -MT : \
-    $(CFLAGS) $(CPPFLAGS) $< -o $@
-# Dependencies for host objects
-HDEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ -MT : \
-    $(HOSTCC_FLAGS) $(CPPFLAGS) $< -o $@
-# Dependencies for precompiled headers
-PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \
-    $(CFLAGS) $(CPPFLAGS) $< -o $@
-
-# Run a static analysis checker
-CHECK = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) $(CPPLAGS) -c $< -o $@
-
-# Run the configured compiler
-COMPILE = $(CC) $(CFLAGS) $(PICFLAG) \
-		  $(CPPFLAGS) \
-		  -c $< -o $@
-
-# Run the compiler for the build host
-HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) $(CPPFLAGS) -c $< -o $@
-
-# Precompile headers
-PCHCOMPILE = @$(CC) -Ilib/replace \
-    $(CFLAGS) $(PICFLAG) $(CPPFLAGS) -c $< -o $@
-
-# Partial linking
-PARTLINK = @$(PROG_LD) -r
-
-make_utility_dir = $(srcdir)/build/make/
-
-include/config.h:
-	@echo "include/config.h not present"
-	@echo "You need to rerun ./autogen.sh and ./configure"
-	@/bin/false
-
-pch::
-
-clean:: clean_pch
-	@echo Removing objects
-	@-find . -name '*.o' -exec rm -f '{}' \;
-	@echo Removing hostcc objects
-	@-find . -name '*.ho' -exec rm -f '{}' \;
-	@echo Removing libraries
-	@-rm -f $(STATIC_LIBS) $(SHARED_LIBS)
-	@-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o
-	@echo Removing modules
-	@-rm -f bin/modules/*/*.$(SHLIBEXT)
-	@-rm -f bin/*_init_module.c
-	@echo Removing dummy targets
-	@-rm -f bin/.*_*
-	@echo Removing generated files
-	@-rm -f bin/*_init_module.c
-	@-rm -f librpc/gen_ndr/*.*
-
-distclean:: clean
-	-rm -f include/config.h include/config_tmp.h include/build.h
-	-rm -f data.mk
-	-rm -f config.status
-	-rm -f config.log config.cache
-	-rm -f config.pm config.mk
-	-rm -f $(PC_FILES)
-
-removebackup::
-	-rm -f *.bak *~ */*.bak */*~ */*/*.bak */*/*~ */*/*/*.bak */*/*/*~
-
-realdistclean:: distclean removebackup
-	-rm -f include/config_tmp.h.in
-	-rm -f version.h
-	-rm -f configure
-	-rm -f $(MANPAGES)
-
-check:: test
-
-unused_macros:
-	$(srcdir)/script/find_unused_macros.pl `find . -name "*.[ch]"` | sort
-
-# Create a static library
-%.a:
-	@echo Linking $@
-	@rm -f $@
-	@mkdir -p $(@D)
-	@$(STLD) $(STLD_FLAGS) $@ $^
-
-include $(make_utility_dir)/templates.mk
-
-###############################################################################
-# File types
-###############################################################################
-
-.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .$(SHLIBEXT) .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .idl .hd
-
-.c.d:
-	@echo "Generating dependencies for $<"
-	@$(DEPENDS)
-
-.c.hd:
-	@echo "Generating host-compiler dependencies for $<"
-	@$(HDEPENDS)
-
-include/includes.d: include/includes.h
-	@echo "Generating dependencies for $<"
-	@$(PCHDEPENDS)
-
-.c.o:
-	@if test -n "$(CC_CHECKER)"; then \
-		echo "Checking  $< with '$(CC_CHECKER)'"; \
-		$(CHECK) ; \
-	fi
-	@echo "Compiling $<"
-	@-mkdir -p `dirname $@`
-	@$(COMPILE) && exit 0 ; \
-		echo "The following command failed:" 1>&2;\
-		echo "$(subst ",\",$(COMPILE))" 1>&2 && exit 1
-
-
-.c.ho:
-	@echo "Compiling $< with host compiler"
-	@-mkdir -p `dirname $@`
-	@$(HCOMPILE) && exit 0;\
-		echo "The following command failed:" 1>&2;\
-		echo "$(subst ",\",$(HCOMPILE))" 1>&2;\
-		$(HCOMPILE) >/dev/null 2>&1
-
-.h.h.gch:
-	@echo "Precompiling $<"
-	@$(PCHCOMPILE)
-
-.y.c:
-	@echo "Building $< with $(YACC)"
-	@-$(make_utility_dir)/yacc_compile.sh "$(YACC)" "$<" "$@"
-
-.l.c:
-	@echo "Building $< with $(LEX)"
-	@-$(make_utility_dir)/lex_compile.sh "$(LEX)" "$<" "$@"
-
-%.a:
-	@echo Linking $@
-	@rm -f $@
-	@mkdir -p $(@D)
-	@$(STLD) $(STLD_FLAGS) $@ $^
-
-
-DOCBOOK_MANPAGE_URL = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-
-.1.xml.1:
-	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-
-.3.xml.3:
-	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-
-.5.xml.5:
-	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-
-.7.xml.7:
-	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-
-.8.xml.8:
-	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-
-dist:: idl_full manpages configure distclean 
-
-configure: 
-	./autogen.sh
-
-showflags::
-	@echo 'Samba will be compiled with flags:'
-	@echo '  CPP        = $(CPP)'
-	@echo '  CPPFLAGS   = $(CPPFLAGS)'
-	@echo '  CC         = $(CC)'
-	@echo '  CFLAGS     = $(CFLAGS)'
-	@echo '  PICFLAG    = $(PICFLAG)'
-	@echo '  BNLD       = $(BNLD)'
-	@echo '  BNLD_FLAGS = $(BNLD_FLAGS)'
-	@echo '  STLD       = $(STLD)'
-	@echo '  STLD_FLAGS = $(STLD_FLAGS)'
-	@echo '  SHLD       = $(SHLD)'
-	@echo '  SHLD_FLAGS = $(SHLD_FLAGS)'
-	@echo '  MDLD       = $(MDLD)'
-	@echo '  MDLD_FLAGS = $(MDLD_FLAGS)'
-	@echo '  SHLIBEXT   = $(SHLIBEXT)'
-
-etags:
-	etags $(ETAGS_OPTIONS) `find $(base_srcdirs) -name "*.[ch]"`
-
-ctags:
-	ctags $(CTAGS_OPTIONS) `find $(base_srcdirs) -name "*.[ch]" | grep -v "_proto\.h"`
-
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk
deleted file mode 100644
index 12a606c432..0000000000
--- a/source4/build/make/templates.mk
+++ /dev/null
@@ -1,143 +0,0 @@
-# Templates file for Samba 4
-# This relies on GNU make.
-#
-# © 2008 Jelmer Vernooij <jelmer@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): $(2) ;
-	@echo Linking $$@
-	@$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
-
-clean::
-	@rm -f $(1)
-
-binaries:: $(1)
-
-endef
-
-# Link a host-machine binary
-# Arguments: target file, depends, flags
-define host_binary_link_template
-$(1): $(2) ;
-	@echo Linking $$@
-	@$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
-
-clean::
-	rm -f $(1)
-
-binaries:: $(1)
-
-endef
-
-# Create a prototype header
-# Arguments: header file, c files
-define proto_header_template
-
-proto:: $(1) ;
-
-clean:: ;
-	rm -f $(1)
-
-$(1): $(2) ;
-	@echo "Creating $$@"
-	@$$(PERL) $$(srcdir)/script/mkproto.pl --srcdir=$$(srcdir) --builddir=$$(builddir) --public=/dev/null --private=$$@ $$^
-
-$($(2):.c=.o): $(1) ;
-
-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)
-
-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)))
-
-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 $(notdir $(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)) installdirs
-
-uninstallbin::
-	@echo "Removing $(notdir $(1))"
-	@rm -f $$(DESTDIR)$$(bindir)/$(notdir $(1))
-endef
-
-define sbinary_install_template
-installsbin:: $$(DESTDIR)$$(sbindir)/$(notdir $(1)) installdirs
-
-uninstallsbin::
-	@echo "Removing $(notdir $(1))"
-	@rm -f $$(DESTDIR)$$(sbindir)/$(notdir $(1))
-endef
diff --git a/source4/build/make/yacc_compile.sh b/source4/build/make/yacc_compile.sh
deleted file mode 100755
index ac4afea3f6..0000000000
--- a/source4/build/make/yacc_compile.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-YACC="$1"
-SRC="$2"
-DEST="$3"
-
-dir=`dirname $SRC`
-file=`basename $SRC`
-base=`basename $SRC .y`
-if [ -z "$YACC" ]; then
-	# if $DEST is more recent than $SRC, we can just touch
-	# otherwise we touch but print out warnings
-	if [ -r $DEST ]; then
-		if [ x`find $SRC -newer $DEST -print` = x$SRC ]; then
-			echo "warning: yacc not found - cannot generate $SRC => $DEST" >&2
-			echo "warning: yacc not found - only updating the timestamp of $DEST" >&2
-		fi
-		touch $DEST;
-		exit;
-	fi
-	echo "error: yacc not found - cannot generate $SRC => $DEST" >&2
-	exit 1;
-fi
-# if $DEST is more recent than $SRC, we can just touch
-if [ -r $DEST ]; then
-	if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
-		touch $DEST;
-		exit;
-	fi
-fi
-TOP=`pwd`
-echo "info: running $YACC -d $file"
-if cd $dir && $YACC -d $file; then
-	if [ -r y.tab.h -a -r y.tab.c ];then
-		echo "info: move y.tab.h to $base.h"
-		sed -e "/^#/!b" -e "s|y\.tab\.h|$SRC|" -e "s|\"$base.y|\"$SRC|"  y.tab.h > $base.h
-		echo "info: move y.tab.c to $base.c"
-		sed -e "s|y\.tab\.c|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.c > $base.c
-		rm -f y.tab.c y.tab.h
-	elif [ ! -r $base.h -a ! -r $base.c]; then
-		echo "$base.h nor $base.c generated."
-		exit 1
-	fi
-fi
-cd $TOP
diff --git a/source4/build/smb_build/README.txt b/source4/build/smb_build/README.txt
deleted file mode 100644
index eac3905cce..0000000000
--- a/source4/build/smb_build/README.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-The Samba Build System

-======================

-

-The build system basically has two main parts: the autoconf-generated 

-shell scripts which check for availability of functions and libraries 

-which is stored in the .m4 files and the information about the various 

-subsystems which is stored in the .mk files.

-

-Object Types

-------------

-the build system knows about the following object types

-

-SUBSYSTEM:

-	a SUBSYSTEM is basicly a collection of functions, which provide an

-	an generic API for a specific problem (e.g. libldb provides an api

-	for gneric ldb databases. libldb_plugin provides a generic api

-	for calling ldb plugins, so 'libldb' and 'libldb_plugin' are subsystems)

-

-MODULE:

-	a MODULE is a specify implementation of a API provided by a SUBSYSTEM.

-	(e.g. 'libldb_tdb' and 'libldb_ldap' are implementations of the subsystem 'libldb' API,

-	 and 'libldb_plugin_timestamp' is a module of the 'libldb_plugin' subsystem)	

-

-EXT_LIB:

-	an EXT_LIB is an external library which is needed by a SUBSYSTEM, MODULE, BINARY or LIBRARY.

-	(e.g. 'gtk' or 'KRB5')

-

-BINARY:

-	a BINARY means a executable binary file.

-	(e.g. 'smbtorture' or 'ldbedit')

-	a BINARY typically has only commandline handling and basic 

-	functionality code in it and depends on the functions of

-	SUBSYSTEM's (REQUIRED_SUBSYSTEMS).

-

-LIBRARY:

-	a LIBRARY means a static and/or shared library,

-	which depends on the used OS.

-	(e.g. for libldb 'libldb.so', 'libldb.so.0' 'libldb.so.0.0.1'

-	      and libldb.a are created on linux)

-	a LIBRARY typicly has only glue code in it and depends on

-	SUBSYSTEM's (REQUIRED_SUBSYSTEMS).

-

-File summary:

--------------

-public.m4 - public M4 macros of the build system

-config_mk.pm - Support for reading .mk files 

-dot.pm - Support for generating .dot files for analysis of dependencies

-input.pm - Input validation

-main.pm - Main

-makefile.pm - Makefile generation

-output.pm - Dependency calculation

-

-Layout

--------

-

-Toplevel file: configure.in

-- included by autogen.sh: aclocal.m4

-  which includes the SMB_YXZ*() macros

-

-- default tests of the build system

-  are in build/smb_build/check_*.m4

-  (mostly compiler and basic C type and function

-   checks)

-

-- subsystem specific stuff should be included by 'SMB_INCLUDE_M4()'

-

-

-Generating the configure file

--------------------------

-you need to rerun ./autogen.sh when 'configure.in' or any

-'.m4' file was modified, then you need to rerun configure.

-

-

-Generating config.status

------------------------------

-you need to run ./config.status (or 'configure') after a '.mk'

-file was changed.

-

-

-Examples

---------

-for now please take a look at the .m4 and .mk files

-you find in the source tree, they should be a good reference to start.

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
deleted file mode 100644
index adfe17d423..0000000000
--- a/source4/build/smb_build/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-- use pkg-config files in the buildsystem?
-- let the build system implement some make functions($(patsubst),$(wildcard),...) and use our own implementations where `make' does not support them
-- include extra_flags.txt using Makefile construction if 
-  supported by current make
-- fix shared module loading for selftest during builds without install
-- remove recursive dependency between LIBSOCKET, LIBCLI_NBT and LIBCLI_RESOLVE
-- clearer distinction between dcerpc and ndr. seperate interface tables? Maybe get rid of 
-  NDR's table altogether and use dlopen/dlsym ?
-- saner names for:
-	libcli.so.0.0.1 (rename to libsmb?)
-	libcli_cldap.so.0.0.1 (rename to libcldap?)
-	libcli_nbt.so.0.0.1 (rename to libnbt?)
-	libcli_wrepl.so.0.0.1 (rename to libwrepl?)
-- generate headermap.txt
-
-set of test scripts that check the code:
-- configure_check_unused.pl
-- find_unused_macros.pl
-- find_unused_makefilevars.pl
-- find_unused_options.sh
-- findstatic.pl
-- minimal_includes.pl
-- check dependencies based on #include lines ?
-- check whether private headers are not used outside their own subsystem
-- undocumented (no manpage) installed binaries
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
deleted file mode 100644
index 8c7d75221c..0000000000
--- a/source4/build/smb_build/config_mk.pm
+++ /dev/null
@@ -1,284 +0,0 @@
-# Samba Build System
-# - config.mk parsing functions
-#
-#  Copyright (C) Stefan (metze) Metzmacher 2004
-#  Copyright (C) Jelmer Vernooij 2005
-#  Released under the GNU GPL
-#
-
-package smb_build::config_mk;
-use smb_build::input;
-use File::Basename;
-
-use strict;
-
-my $section_types = {
-	"EXT_LIB" => {
-		"LIBS"			=> "list",
-		"CFLAGS"		=> "list",
-		"CPPFLAGS"		=> "list",
-		"LDFLAGS"		=> "list",
-		},
-	"PYTHON" => {
-		"LIBRARY_REALNAME" => "string",
-		"PRIVATE_DEPENDENCIES"	=> "list",
-		"PUBLIC_DEPENDENCIES"	=> "list",
-		"ENABLE"		=> "bool",
-		"LDFLAGS"		=> "list",
-	},
-	"SUBSYSTEM" => {
-		"PRIVATE_DEPENDENCIES"	=> "list",
-		"PUBLIC_DEPENDENCIES"	=> "list",
-
-		"ENABLE"		=> "bool",
-
-		"CFLAGS"		=> "list",
-		"LDFLAGS"		=> "list",
-		"STANDARD_VISIBILITY"	=> "string",
-		"INIT_FUNCTION_SENTINEL" => "string"
-		},
-	"MODULE" => {
-		"SUBSYSTEM"		=> "string",
-
-		"INIT_FUNCTION"		=> "string",
-
-		"PRIVATE_DEPENDENCIES"	=> "list",
-
-		"ALIASES" => "list",
-
-		"ENABLE"		=> "bool",
-
-		"OUTPUT_TYPE"		=> "list",
-
-		"CFLAGS"		=> "list"
-		},
-	"BINARY" => {
-
-		"PRIVATE_DEPENDENCIES"	=> "list",
-
-		"ENABLE"		=> "bool",
-
-		"INSTALLDIR"		=> "string",
-		"LDFLAGS"		=> "list",
-		"STANDARD_VISIBILITY"	=> "string",
-
-		"USE_HOSTCC"		=> "bool"
-		},
-	"LIBRARY" => {
-		"LIBRARY_REALNAME" => "string",
-
-		"INIT_FUNCTION_TYPE"	=> "string",
-		"INIT_FUNCTION_SENTINEL" => "string",
-		"OUTPUT_TYPE"		=> "list",
-
-		"PRIVATE_DEPENDENCIES"	=> "list",
-		"PUBLIC_DEPENDENCIES"	=> "list",
-
-		"ENABLE"		=> "bool",
-
-		"CFLAGS"		=> "list",
-		"LDFLAGS"		=> "list",
-		"STANDARD_VISIBILITY"	=> "string"
-		}
-};
-
-use vars qw(@parsed_files);
-
-@parsed_files = ();
-
-sub _read_config_file($$$)
-{
-	use Cwd;
-
-	my ($srcdir, $builddir, $filename) = @_;
-	my @dirlist;
-
-	# We need to change our working directory because config.mk files can
-	# give shell commands as the argument to "include". These shell
-	# commands can take arguments that are relative paths and we don't have
-	# a way of sensibly rewriting these.
-	my $cwd = getcwd;
-	chomp $cwd;
-
-	if ($srcdir ne $builddir) {
-		# Push the builddir path on the front, so we prefer builddir
-		# to srcdir when the file exists in both.
-		@dirlist = ($builddir, $srcdir);
-	} else {
-		@dirlist = ($srcdir);
-	}
-
-	foreach my $d (@dirlist) {
-		my @lines;
-		my $basedir;
-
-		chdir $cwd;
-		chdir $d;
-
-		# We need to catch the exception from open in the case where
-		# the filename is actually a shell pipeline. Why is this
-		# different to opening a regular file? Because this is perl!
-		eval {
-			open(CONFIG_MK, "./$filename");
-			@lines = <CONFIG_MK>;
-			close(CONFIG_MK);
-		};
-
-		chdir $cwd;
-		next unless (@lines);
-
-		# I blame abartlett for this crazy hack -- jpeach
-		if ($filename =~ /\|$/) {
-			$basedir = $builddir;
-		} else {
-			$basedir = dirname($filename);
-			push(@parsed_files, $filename);
-		}
-		$basedir =~ s!^($builddir|$srcdir)[/]!!;
-		return ($filename, $basedir, @lines);
-	}
-
-	chdir $cwd;
-	return;
-}
-
-###########################################################
-# The parsing function which parses the file
-#
-# $result = _parse_config_mk($input, $srcdir, $builddir, $filename)
-#
-# $filename -	the path of the config.mk file
-#		which should be parsed
-sub run_config_mk($$$$)
-{
-	sub run_config_mk($$$$);
-	my ($input, $srcdir, $builddir, $filename) = @_;
-	my $result;
-	my $linenum = -1;
-	my $infragment = 0;
-	my $section = "GLOBAL";
-	my $makefile = "";
-
-	my $basedir;
-
-	my $parsing_file;
-	my @lines;
-
-	$ENV{builddir} = $builddir;
-	$ENV{srcdir} = $srcdir;
-
-	($parsing_file, $basedir, @lines) =
-	    _read_config_file($srcdir, $builddir, $filename);
-
-	die ("$0: can't open '$filename'")
-		unless ($parsing_file and $basedir and @lines);
-
-	my $line = "";
-	my $prev = "";
-
-	# Emit a line that lets us match up final makefile output with the
-	# corresponding input files. The curlies are so you can match the
-	# BEGIN/END pairs in a text editor.
-	$makefile .= "# BEGIN{ $parsing_file\n";
-
-	foreach (@lines) {
-		$linenum++;
-
-		# lines beginning with '#' are ignored
-		next if (/^\#.*$/);
-		
-		if (/^(.*)\\$/) {
-			$prev .= $1;
-			next;
-		} else {
-			$line = "$prev$_";
-			$prev = "";
-		}
-
-		if ($line =~ /^\[([-a-zA-Z0-9_.:]+)\][\t ]*$/) 
-		{
-			$section = $1;
-			$infragment = 0;
-
-			$result->{$section}{EXISTS}{KEY} = "EXISTS";
-			$result->{$section}{EXISTS}{VAL} = 1;
-			next;
-		}
-
-		# include
-		if ($line =~ /^mkinclude (.*)$/) {
-			my $subfile= $1;
-			my $subdir = dirname($filename);
-			$subdir =~ s/^\.$//g;
-			$subdir =~ s/^\.\///g;
-			$subdir .= "/" if ($subdir ne "");
-			$makefile .= "basedir := $subdir\n";
-			$makefile .= run_config_mk($input, $srcdir, $builddir, $subdir.$subfile);
-			next;
-		}
-
-		# empty line
-		if ($line =~ /^[ \t]*$/) {
-			$section = "GLOBAL";
-			if ($infragment) { $makefile.="\n"; }
-			next;
-		}
-
-		# global stuff is considered part of the makefile
-		if ($section eq "GLOBAL") {
-			if (!$infragment) { $makefile.="\n"; }
-			$makefile .= $line;
-			$infragment = 1;
-			next;
-		}
-		
-		# Assignment
-		if ($line =~ /^([a-zA-Z0-9_]+)[\t ]*=(.*)$/) {
-			$result->{$section}{$1}{VAL} = $2;
-			$result->{$section}{$1}{KEY} = $1;
-		
-			next;
-		}
-
-		die("$parsing_file:$linenum: Bad line");
-	}
-
-	$makefile .= "# }END $parsing_file\n";
-
-	foreach my $section (keys %{$result}) {
-		my ($type, $name) = split(/::/, $section, 2);
-
-		my $sectype = $section_types->{$type};
-		if (not defined($sectype)) {
-			die($parsing_file.":[".$section."] unknown section type \"".$type."\"!");
-		}
-
-		$input->{$name}{NAME} = $name;
-		$input->{$name}{TYPE} = $type;
-		$input->{$name}{MK_FILE} = $parsing_file;
-		$input->{$name}{BASEDIR} = $basedir;
-
-		foreach my $key (values %{$result->{$section}}) {
-			next if ($key->{KEY} eq "EXISTS");
-			$key->{VAL} = smb_build::input::strtrim($key->{VAL});
-			my $vartype = $sectype->{$key->{KEY}};
-			if (not defined($vartype)) {
-				die($parsing_file.":[".$section."]: unknown attribute type \"$key->{KEY}\"!");
-			}
-			if ($vartype eq "string") {
-				$input->{$name}{$key->{KEY}} = $key->{VAL};
-			} elsif ($vartype eq "list") {
-				$input->{$name}{$key->{KEY}} = [smb_build::input::str2array($key->{VAL})];
-			} elsif ($vartype eq "bool") {
-				if (($key->{VAL} ne "YES") and ($key->{VAL} ne "NO")) {
-					die("Invalid value for bool attribute $key->{KEY}: $key->{VAL} in section $section");
-				}
-				$input->{$name}{$key->{KEY}} = $key->{VAL};
-			}
-		}
-	}
-
-	return $makefile;
-}
-
-1;
diff --git a/source4/build/smb_build/dot.pl b/source4/build/smb_build/dot.pl
deleted file mode 100755
index b30c320c6e..0000000000
--- a/source4/build/smb_build/dot.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/perl
-# Samba4 Dependency Graph Generator
-# (C) 2004-2005 Jelmer Vernooij <jelmer@samba.org>
-# Published under the GNU GPL
-
-use strict;
-use lib 'build';
-use smb_build::config_mk;
-
-my $subsys = shift @ARGV;
-
-sub contains($$)
-{
-	my ($haystack,$needle) = @_;
-	foreach (@$haystack) {
-		return 1 if ($_ eq $needle);
-	}
-	return 0;
-}
-
-sub generate($$$)
-{
-	my ($depend,$only,$name) = @_;
-	my $res = "digraph $name {\n";
-
-	foreach my $part (values %{$depend}) {
-		next if (defined($only) and not contains($only,$part->{NAME}));
-		foreach my $elem (@{$part->{PUBLIC_DEPENDENCIES}}) {
-			$res .= "\t\"$part->{NAME}\" -> \"$elem\" [style=filled]; /* public */\n";
-		}
-		foreach my $elem (@{$part->{PRIVATE_DEPENDENCIES}}) {
-			$res .= "\t\"$part->{NAME}\" -> \"$elem\" [style=dotted]; /* private */\n";
-		}
-	}
-
-	return $res . "}\n";
-}
-
-my $INPUT = {};
-smb_build::config_mk::run_config_mk($INPUT, '.', '.', "main.mk");
-
-my $name = "samba4";
-
-my $only;
-if (defined($subsys)) {
-	my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, 
-		"MERGED_OBJ", "SHARED_LIBRARY", "SHARED_LIBRARY");
-
-	die("No such subsystem $subsys") unless (defined($DEPEND->{$subsys}));
-
-	$only = $DEPEND->{$subsys}->{UNIQUE_DEPENDENCIES_ALL};
-	push (@$only, "$subsys");
-
-	$name = $subsys;
-}
-
-my $fname = "$name-deps.dot";
-print __FILE__.": creating $fname\n";
-open DOTTY, ">$fname";
-print DOTTY generate($INPUT, $only, $name);
-close DOTTY;
-
-1;
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
deleted file mode 100644
index 27a00890b4..0000000000
--- a/source4/build/smb_build/input.pm
+++ /dev/null
@@ -1,278 +0,0 @@
-# Samba Build System
-# - the input checking functions
-#
-#  Copyright (C) Stefan (metze) Metzmacher 2004
-#  Copyright (C) Jelmer Vernooij 2004
-#  Released under the GNU GPL
-
-use strict;
-package smb_build::input;
-use File::Basename;
-
-sub strtrim($)
-{
-	$_ = shift;
-	s/^[\t\n ]*//g;
-	s/[\t\n ]*$//g;
-	return $_;
-}
-
-sub str2array($)
-{
-	$_ = shift;
-	s/^[\t\n ]*//g;
-	s/[\t\n ]*$//g;
-	s/([\t\n ]+)/ /g;
-
-	return () if (length($_)==0);
-	return split /[ \t\n]/;
-}
-
-sub add_libreplace($)
-{
-	my ($part) = @_;
-
-	return if ($part->{NAME} eq "LIBREPLACE");
-	return if ($part->{NAME} eq "LIBREPLACE_HOSTCC");
-	return if ($part->{NAME} eq "REPLACE_READDIR");
-
-	foreach my $n (@{$part->{PRIVATE_DEPENDENCIES}}) {
-		return if ($n eq "LIBREPLACE");
-		return if ($n eq "LIBREPLACE_HOSTCC");
-	}
-	foreach my $n (@{$part->{PUBLIC_DEPENDENCIES}}) {
-		return if ($n eq "LIBREPLACE");
-		return if ($n eq "LIBREPLACE_HOSTCC");
-	}
-
-	if (defined($part->{USE_HOSTCC}) && $part->{USE_HOSTCC} eq "YES") {
-		unshift (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE_HOSTCC");
-	} else {
-		unshift (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE");
-	}
-}
-
-sub check_subsystem($$$)
-{
-	my ($INPUT, $subsys, $default_ot) = @_;
-	return if ($subsys->{ENABLE} ne "YES");
-	
-	unless (defined($subsys->{OUTPUT_TYPE})) { $subsys->{OUTPUT_TYPE} = $default_ot; }
-	unless (defined($subsys->{INIT_FUNCTION_TYPE})) { $subsys->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
-	unless (defined($subsys->{INIT_FUNCTION_SENTINEL})) { $subsys->{INIT_FUNCTION_SENTINEL} = "NULL"; }
-}
-
-sub check_module($$$)
-{
-	my ($INPUT, $mod, $default_ot) = @_;
-
-	die("Module $mod->{NAME} does not have a SUBSYSTEM set") if not defined($mod->{SUBSYSTEM});
-
-	if (not exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS})) {
-		$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS} = [];
-	}
-
-	if (!(defined($INPUT->{$mod->{SUBSYSTEM}}))) {
-		die("Unknown subsystem $mod->{SUBSYSTEM} for module $mod->{NAME}");
-	}
-
-	if ($INPUT->{$mod->{SUBSYSTEM}} eq "NO") {
-		warn("Disabling module $mod->{NAME} because subsystem $mod->{SUBSYSTEM} is disabled");
-		$mod->{ENABLE} = "NO";
-		return;
-	}
-
-	return if ($mod->{ENABLE} ne "YES");
-
-	if (exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE})) {
-		$mod->{INIT_FUNCTION_TYPE} = $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE};
-	} else {
-		$mod->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)";
-	}
-
-	unless (defined($mod->{INIT_FUNCTION_SENTINEL})) { $mod->{INIT_FUNCTION_SENTINEL} = "NULL"; }
-
-	if (not defined($mod->{OUTPUT_TYPE})) {
-		if ((not defined($INPUT->{$mod->{SUBSYSTEM}})) or
-			(not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or 
-			$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
-			$mod->{OUTPUT_TYPE} = ["SHARED_LIBRARY"];
-		} else {
-			$mod->{OUTPUT_TYPE} = $default_ot;
-		}
-	}
-
-	if (grep(/SHARED_LIBRARY/, @{$mod->{OUTPUT_TYPE}})) {
-		my $sane_subsystem = lc($mod->{SUBSYSTEM});
-		$sane_subsystem =~ s/^lib//;
-		$mod->{INSTALLDIR} = "MODULESDIR/$sane_subsystem";
-		push (@{$mod->{PUBLIC_DEPENDENCIES}}, $mod->{SUBSYSTEM});
-		add_libreplace($mod);
-	} 
-	if (grep(/MERGED_OBJ/, @{$mod->{OUTPUT_TYPE}}) and $mod->{TYPE} ne "PYTHON") {
-		push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
-		push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
-	}
-}
-
-sub check_library($$$)
-{
-	my ($INPUT, $lib, $default_ot) = @_;
-
-	return if ($lib->{ENABLE} ne "YES");
-
-	unless (defined($lib->{OUTPUT_TYPE})) { $lib->{OUTPUT_TYPE} = $default_ot; }
-
-	unless (defined($lib->{INIT_FUNCTION_TYPE})) { $lib->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
-	unless (defined($lib->{INIT_FUNCTION_SENTINEL})) { $lib->{INIT_FUNCTION_SENTINEL} = "NULL"; }
-	unless (defined($lib->{INSTALLDIR})) { $lib->{INSTALLDIR} = "LIBDIR"; }
-
-	add_libreplace($lib);
-}
-
-sub check_python($$$)
-{
-	my ($INPUT, $python, $default_ot) = @_;
-
-	return if ($INPUT->{LIBPYTHON}{ENABLE} ne "YES");
-
-	$python->{INSTALLDIR} = "PYTHONDIR";
-	unless (defined($python->{CFLAGS})) { $python->{CFLAGS} = []; }
-	my $basename = $python->{NAME};
-	$basename =~ s/^python_//g;
-	unless (defined($python->{LIBRARY_REALNAME})) {
-		$python->{LIBRARY_REALNAME} = "$basename.\$(SHLIBEXT)";
-	}
-	$python->{INIT_FUNCTION} = "{ (char *)\"$basename\", init$basename }";
-	push (@{$python->{CFLAGS}}, "\$(EXT_LIB_PYTHON_CFLAGS)");
-
-	$python->{SUBSYSTEM} = "LIBPYTHON";
-
-	check_module($INPUT, $python, $default_ot);
-}
-
-sub check_binary($$)
-{
-	my ($INPUT, $bin) = @_;
-
-	return if ($bin->{ENABLE} ne "YES");
-
-	($bin->{BINARY} = (lc $bin->{NAME})) if not defined($bin->{BINARY});
-	unless (defined($bin->{INIT_FUNCTION_SENTINEL})) { $bin->{INIT_FUNCTION_SENTINEL} = "NULL"; }
-	unless (defined($bin->{INIT_FUNCTION_TYPE})) { $bin->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
-
-	$bin->{OUTPUT_TYPE} = ["BINARY"];
-	add_libreplace($bin);
-}
-
-sub add_implicit($$)
-{
-	my ($INPUT, $n) = @_;
-
-	$INPUT->{$n}->{TYPE} = "MAKE_RULE";
-	$INPUT->{$n}->{NAME} = $n;
-	$INPUT->{$n}->{OUTPUT_TYPE} = undef;
-	$INPUT->{$n}->{LIBS} = ["\$(".uc($n)."_LIBS)"];
-	$INPUT->{$n}->{LDFLAGS} = ["\$(".uc($n)."_LDFLAGS)"];
-	$INPUT->{$n}->{CFLAGS} = ["\$(".uc($n)."_CFLAGS)"];
-	$INPUT->{$n}->{CPPFLAGS} = ["\$(".uc($n)."_CPPFLAGS)"];
-	$INPUT->{$n}->{ENABLE} = "YES";
-}
-
-sub calc_unique_deps($$$$$$$$)
-{
-	sub calc_unique_deps($$$$$$$$);
-	my ($name, $INPUT, $deps, $udeps, $withlibs, $forward, $pubonly, $busy) = @_;
-
-	foreach my $n (@$deps) {
-		add_implicit($INPUT, $n) unless (defined($INPUT->{$n}) and defined($INPUT->{$n}->{TYPE}));
-		my $dep = $INPUT->{$n};
-		if (grep (/^$n$/, @$busy)) {
-			next if (@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ");
-			die("Recursive dependency: $n, list: " . join(',', @$busy));
-		}
-		next if (grep /^$n$/, @$udeps);
-
-		push (@{$udeps}, $n) if $forward;
-
- 		if (defined ($dep->{OUTPUT_TYPE}) && 
-			($withlibs or 
-			(@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") or 
-			(@{$dep->{OUTPUT_TYPE}}[0] eq "STATIC_LIBRARY"))) {
-				push (@$busy, $n);
-			        calc_unique_deps($n, $INPUT, $dep->{PUBLIC_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy);
-			        calc_unique_deps($n, $INPUT, $dep->{PRIVATE_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy) unless $pubonly;
-				pop (@$busy);
-	        }
-
-		unshift (@{$udeps}, $n) unless $forward;
-	}
-}
-
-sub check($$$$$)
-{
-	my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_;
-
-	foreach my $part (values %$INPUT) {
-		if (defined($enabled->{$part->{NAME}})) { 
-			$part->{ENABLE} = $enabled->{$part->{NAME}};
-			next;
-		}
-		
-		unless(defined($part->{ENABLE})) {
-			if ($part->{TYPE} eq "EXT_LIB") {
-				$part->{ENABLE} = "NO";
-			} else {
-				$part->{ENABLE} = "YES";
-			}
-		}
-	}
-
-	foreach my $part (values %$INPUT) {
-		$part->{LINK_FLAGS} = [];
-		$part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_FILES)"];
-
-		if ($part->{TYPE} eq "SUBSYSTEM") { 
-			check_subsystem($INPUT, $part, $subsys_ot);
-		} elsif ($part->{TYPE} eq "MODULE") {
-			check_module($INPUT, $part, $module_ot);
-		} elsif ($part->{TYPE} eq "LIBRARY") {
-			check_library($INPUT, $part, $lib_ot);
-		} elsif ($part->{TYPE} eq "BINARY") {
-			check_binary($INPUT, $part);
-		} elsif ($part->{TYPE} eq "PYTHON") {
-			check_python($INPUT, $part, $module_ot);
-		} elsif ($part->{TYPE} eq "EXT_LIB") {
-		} else {
-			die("Unknown type $part->{TYPE}");
-		}
-	}
-
-	foreach my $part (values %$INPUT) {
-		if (defined($part->{INIT_FUNCTIONS})) {
-			push (@{$part->{LINK_FLAGS}}, "\$(DYNEXP)");
-		}
-	}
-
-	foreach my $part (values %$INPUT) {
-		$part->{UNIQUE_DEPENDENCIES_LINK} = [];
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PUBLIC_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_LINK}, 0, 0, 0, []);
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PRIVATE_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_LINK}, 0, 0, 0, []);
-	}
-
-	foreach my $part (values %$INPUT) {
-		$part->{UNIQUE_DEPENDENCIES_COMPILE} = [];
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PUBLIC_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_COMPILE}, 1, 1, 1, []);
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PRIVATE_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_COMPILE}, 1, 1, 1, []);
-	}
-
-	foreach my $part (values %$INPUT) {
-		$part->{UNIQUE_DEPENDENCIES_ALL} = [];
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PUBLIC_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_ALL}, 1, 0, 0, []);
-		calc_unique_deps($part->{NAME}, $INPUT, $part->{PRIVATE_DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_ALL}, 1, 0, 0, []);
-	}
-
-	return $INPUT;
-}
-
-1;
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
deleted file mode 100644
index fbea269300..0000000000
--- a/source4/build/smb_build/main.pl
+++ /dev/null
@@ -1,105 +0,0 @@
-# Samba Build System					
-# - the main program					
-#							
-#  Copyright (C) Stefan (metze) Metzmacher 2004	
-#  Copyright (C) Jelmer Vernooij 2005
-#  Released under the GNU GPL				
-
-use smb_build::makefile;
-use smb_build::input;
-use smb_build::config_mk;
-use smb_build::output;
-use smb_build::summary;
-use smb_build::config;
-use Getopt::Long;
-use strict;
-
-my $output_file = "data.mk";
-
-my $result = GetOptions (
-	'output=s' => \$output_file);
-
-if (not $result) {
-	exit(1);
-}
-
-my $input_file = shift @ARGV;
-
-my $INPUT = {};
-my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, $input_file);
-
-my $subsys_output_type = ["MERGED_OBJ"];
-
-my $library_output_type;
-my $useshared = (defined($ENV{USESHARED})?$ENV{USESHARED}:$config::config{USESHARED});
-
-if ($useshared eq "true") {
-	$library_output_type = ["SHARED_LIBRARY", "MERGED_OBJ"];
-} else {
-	$library_output_type = ["MERGED_OBJ"];
-	push (@$library_output_type, "SHARED_LIBRARY") if 
-						($config::config{BLDSHARED} eq "true")
-}
-
-my $module_output_type;
-if ($useshared eq "true") {
-	#$module_output_type = ["SHARED_LIBRARY"];
-	$module_output_type = ["MERGED_OBJ"];
-} else {
-	$module_output_type = ["MERGED_OBJ"];
-}
-
-my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
-				     $subsys_output_type,
-				     $library_output_type,
-				     $module_output_type);
-my $OUTPUT = output::create_output($DEPEND, \%config::config);
-my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
-
-my $shared_libs_used = 0;
-foreach my $key (values %$OUTPUT) {
-	next if ($key->{ENABLE} ne "YES");
-	push(@{$mkenv->{all_objs}}, "\$($key->{NAME}_OBJ_FILES)");
-}
-
-foreach my $key (values %$OUTPUT) {
-	next unless defined $key->{OUTPUT_TYPE};
-
-	$mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-	$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
-	$mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
-					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-	if ($key->{TYPE} eq "LIBRARY" and 
-	    ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
-		$shared_libs_used = 1;
-	}
-	if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
-		$mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS +=$key->{INIT_FUNCTION},\n");
-	}
-	$mkenv->CFlags($key);
-}
-
-foreach my $key (values %$OUTPUT) {
-	next unless defined $key->{OUTPUT_TYPE};
-
- 	$mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}});
-}
-
-foreach my $key (values %$OUTPUT) {
-	next unless defined $key->{OUTPUT_TYPE};
-	$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-
-	$mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
-					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-	$mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" and
-					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}));
-	$mkenv->PythonModule($key) if ($key->{TYPE} eq "PYTHON");
-	$mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
-	$mkenv->InitFunctions($key) if defined($key->{INIT_FUNCTIONS});
-}
-
-$mkenv->write($output_file);
-
-summary::show($OUTPUT, \%config::config);
-
-1;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
deleted file mode 100644
index 3a6f4b7d4f..0000000000
--- a/source4/build/smb_build/makefile.pm
+++ /dev/null
@@ -1,281 +0,0 @@
-# Samba Build System
-# - create output for Makefile
-#
-#  Copyright (C) Stefan (metze) Metzmacher 2004
-#  Copyright (C) Jelmer Vernooij 2005
-#  Released under the GNU GPL
-
-package smb_build::makefile;
-use smb_build::output;
-use File::Basename;
-use strict;
-
-use Cwd 'abs_path';
-
-sub new($$$)
-{
-	my ($myname, $config, $mkfile) = @_;
-	my $self = {};
-
-	bless($self, $myname);
-
-	$self->_set_config($config);
-
-	$self->{output} = "";
-
-	$self->output("################################################\n");
-	$self->output("# Autogenerated by source4/build/smb_build/makefile.pm #\n");
-	$self->output("################################################\n");
-	$self->output("\n");
-	$self->output($mkfile);
-
-	return $self;
-}
-
-sub _set_config($$)
-{
-	my ($self, $config) = @_;
-
-	$self->{config} = $config;
-
-	if (not defined($self->{config}->{srcdir})) {
-		$self->{config}->{srcdir} = '.';
-	}
-
-	if (not defined($self->{config}->{builddir})) {
-		$self->{config}->{builddir}  = '.';
-	}
-
-	if ($self->{config}->{prefix} eq "NONE") {
-		$self->{config}->{prefix} = $self->{config}->{ac_default_prefix};
-	}
-
-	if ($self->{config}->{exec_prefix} eq "NONE") {
-		$self->{config}->{exec_prefix} = $self->{config}->{prefix};
-	}
-}
-
-sub output($$)
-{
-	my ($self, $text) = @_;
-
-	$self->{output} .= $text;
-}
-
-sub _prepare_mk_files($)
-{
-	my $self = shift;
-	my @tmp = ();
-
-	foreach (@smb_build::config_mk::parsed_files) {
-		s/ .*$//g;
-		push (@tmp, $_);
-	}
-
-	$self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
-}
-
-sub array2oneperline($)
-{
-	my $array = shift;
-	my $output = "";
-
-	foreach (@$array) {
-		next unless defined($_);
-
-		$output .= " \\\n\t\t$_";
-	}
-
-	return $output;
-}
-
-sub _prepare_list($$$)
-{
-	my ($self,$ctx,$var) = @_;
-	my @tmparr = ();
-
-	push(@tmparr, @{$ctx->{$var}}) if defined($ctx->{$var});
-
-	my $tmplist = array2oneperline(\@tmparr);
-	return if ($tmplist eq "");
-
-	$self->output("$ctx->{NAME}_$var =$tmplist\n");
-}
-
-sub PythonModule($$)
-{
-	my ($self,$ctx) = @_;
-
-	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-	$self->_prepare_list($ctx, "DEPEND_LIST");
-	$self->_prepare_list($ctx, "LINK_FLAGS");
-
-	$self->output("\$(eval \$(call python_c_module_template,$ctx->{LIBRARY_REALNAME},\$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS)))\n");
-}
-
-sub SharedModule($$)
-{
-	my ($self,$ctx) = @_;
-
-	my $sane_subsystem = lc($ctx->{SUBSYSTEM});
-	$sane_subsystem =~ s/^lib//;
-	
-	$self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
-	$self->output("\$(eval \$(call shared_module_install_template,$sane_subsystem,$ctx->{LIBRARY_REALNAME}))\n");
-
-	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-	$self->_prepare_list($ctx, "DEPEND_LIST");
-	$self->_prepare_list($ctx, "LINK_FLAGS");
-
-	if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/ and not ($ctx->{INIT_FUNCTION} =~ /\(/)) {
-		$self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-D$ctx->{INIT_FUNCTION}=samba_init_module\n");
-	}
-
-	$self->output("\$(eval \$(call shared_module_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS)))\n");
-
-
-	if (defined($ctx->{ALIASES})) {
-		$self->output("\$(eval \$(foreach alias,". join(' ', @{$ctx->{ALIASES}}) . ",\$(call shared_module_alias_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME},$sane_subsystem,\$(alias))))\n");
-	}
-}
-
-sub StaticLibraryPrimitives($$)
-{
-	my ($self,$ctx) = @_;
- 
- 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-}
-
-sub SharedLibraryPrimitives($$)
-{
-	my ($self,$ctx) = @_;
-
-	if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) {
-		$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-		$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-	}
-}
-
-sub SharedLibrary($$)
-{
-	my ($self,$ctx) = @_;
-
-	$self->output("SHARED_LIBS += $ctx->{RESULT_SHARED_LIBRARY}\n");
-
-	$self->_prepare_list($ctx, "DEPEND_LIST");
-	$self->_prepare_list($ctx, "LINK_FLAGS");
-
-	$self->output("\$(eval \$(call shared_library_template,$ctx->{RESULT_SHARED_LIBRARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS),$ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME},$ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}))\n");
-}
-
-sub MergedObj($$)
-{
-	my ($self, $ctx) = @_;
-
-	$self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
-}
-
-sub InitFunctions($$)
-{
-	my ($self, $ctx) = @_;
-	$self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-DSTATIC_$ctx->{NAME}_MODULES=\"\$($ctx->{NAME}_INIT_FUNCTIONS)$ctx->{INIT_FUNCTION_SENTINEL}\"\n");
-}
-
-sub StaticLibrary($$)
-{
-	my ($self,$ctx) = @_;
-
-	$self->output("STATIC_LIBS += $ctx->{RESULT_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
-	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
-}
-
-sub Binary($$)
-{
-	my ($self,$ctx) = @_;
-
-	unless (defined($ctx->{INSTALLDIR})) {
-	} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
-		$self->output("\$(eval \$(call sbinary_install_template,$ctx->{RESULT_BINARY}))\n");
-	} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
-		$self->output("\$(eval \$(call binary_install_template,$ctx->{RESULT_BINARY}))\n");
-	}
-
-	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-	$self->_prepare_list($ctx, "DEPEND_LIST");
-	$self->_prepare_list($ctx, "LINK_FLAGS");
-
-	if (defined($ctx->{USE_HOSTCC}) && $ctx->{USE_HOSTCC} eq "YES") {
-$self->output("\$(eval \$(call host_binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_FULL_OBJ_LIST) \$($ctx->{NAME}_DEPEND_LIST), \$($ctx->{NAME}_LINK_FLAGS)))\n");
-	} else {
-$self->output("\$(eval \$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_FULL_OBJ_LIST) \$($ctx->{NAME}_DEPEND_LIST), \$($ctx->{NAME}_LINK_FLAGS)))\n");
-	}
-}
-
-sub write($$)
-{
-	my ($self, $file) = @_;
-
-	$self->_prepare_mk_files();
-
-	$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
-
-	open(MAKEFILE,">$file") || die ("Can't open $file\n");
-	print MAKEFILE $self->{output};
-	close(MAKEFILE);
-
-	print __FILE__.": creating $file\n";
-}
-
-my $sort_available = eval "use sort 'stable'; return 1;";
-$sort_available = 0 unless defined($sort_available);
-
-sub by_path {
-	return  1 if($a =~ m#^\-I/#);
-    	return -1 if($b =~ m#^\-I/#);
-	return  0;
-}
-
-sub CFlags($$)
-{
-	my ($self, $key) = @_;
-
-	my $srcdir = $self->{config}->{srcdir};
-	my $builddir = $self->{config}->{builddir};
-
-	my $src_ne_build = ($srcdir ne $builddir) ? 1 : 0;
-
-	return unless defined ($key->{FINAL_CFLAGS});
-	return unless (@{$key->{FINAL_CFLAGS}} > 0);
-
-	my @sorted_cflags = @{$key->{FINAL_CFLAGS}};
-	if ($sort_available) {
-		@sorted_cflags = sort by_path @{$key->{FINAL_CFLAGS}};
-	}
-
-	# Rewrite CFLAGS so that both the source and the build
-	# directories are in the path.
-	my @cflags = ();
-	foreach my $flag (@sorted_cflags) {
-		if($src_ne_build) {
-			if($flag =~ m#^-I([^/].*$)#) {
-				my $dir = $1;
-				if ($dir =~ /^\$\(/) {
-					push (@cflags, $flag);
-					next;
-				}
-				$dir =~ s#^\$\((?:src|build)dir\)/?##;
-				push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
-				next;
-			}
-		}
-		push(@cflags, $flag);
-	}
-	
-	my $cflags = join(' ', @cflags);
-
-	$self->output("\$(patsubst %.ho,%.d,\$($key->{NAME}_OBJ_FILES:.o=.d)) \$($key->{NAME}_OBJ_FILES): CFLAGS+= $cflags\n");
-}
-
-1;
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
deleted file mode 100644
index aada681ef4..0000000000
--- a/source4/build/smb_build/output.pm
+++ /dev/null
@@ -1,172 +0,0 @@
-# SMB Build System
-# - the output generating functions
-#
-#  Copyright (C) Stefan (metze) Metzmacher 2004
-#  Copyright (C) Jelmer Vernooij 2004
-#  Released under the GNU GPL
-
-package output;
-use strict;
-
-sub generate_shared_library($)
-{
-	my $lib = shift;
-	my $link_name;
-	my $lib_name;
-
-	$lib->{DEPEND_LIST} = [];
-
-	$link_name = lc($lib->{NAME});
-	$lib_name = $link_name;
-
-	if ($lib->{TYPE} eq "LIBRARY") {
-		$link_name = $lib->{NAME};
-		$link_name =~ s/^LIB//;
-		$link_name = lc($link_name);
-		$lib_name = "lib$link_name";
-	}
-
-	if ($lib->{TYPE} eq "PYTHON") {
-		$lib->{SHAREDDIR} = "bin/python";
-	} elsif (defined($lib->{LIBRARY_REALNAME})) {
-		$lib->{BASEDIR} =~ s/^\.\///g;
-		$lib->{SHAREDDIR} = $lib->{BASEDIR};
-	} else {
-		if ($lib->{TYPE} eq "MODULE") {
-			my $sane_subsystem = lc($lib->{SUBSYSTEM});
-			$sane_subsystem =~ s/^lib//;
-			$lib->{SHAREDDIR} = "bin/modules/$sane_subsystem";
-			$lib->{LIBRARY_REALNAME} = $link_name;
-			$lib->{LIBRARY_REALNAME} =~ s/^$sane_subsystem\_//g;
-			$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
-		} else {
-			$lib->{SHAREDDIR} = "\$(shliboutputdir)";
-			$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
-		}
-	}
-
-	$lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME};
-
-	$lib->{LIBRARY_SONAME} = "\$(if \$($lib->{NAME}_SOVERSION),$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_SOVERSION),$lib->{LIBRARY_REALNAME})";
-	$lib->{LIBRARY_REALNAME} = "\$(if \$($lib->{NAME}_VERSION),$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_VERSION),$lib->{LIBRARY_REALNAME})";
-	
-	$lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}";
-	$lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name";
-	$lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_DEBUGNAME}";
-}
-
-sub generate_merged_obj($)
-{
-	my $lib = shift;
-
-	my $link_name = $lib->{NAME};
-	$link_name =~ s/^LIB//;
-
-	$lib->{MERGED_OBJNAME} = lc($link_name).".o";
-	$lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
-	$lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
-}
-
-sub generate_static_library($)
-{
-	my $lib = shift;
-	my $link_name;
-
-	$lib->{DEPEND_LIST} = [];
-
-	$link_name = $lib->{NAME};
-	$link_name =~ s/^LIB//;
-
-	$lib->{LIBRARY_NAME} = "lib".lc($link_name).".a";
-
-	$lib->{RESULT_STATIC_LIBRARY} = "bin/static/$lib->{LIBRARY_NAME}";
-	$lib->{TARGET_STATIC_LIBRARY} = $lib->{RESULT_STATIC_LIBRARY};
-	$lib->{STATICDIR} = 'bin/static';
-	$lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name);
-}
-
-sub generate_binary($)
-{
-	my $bin = shift;
-
-	$bin->{DEPEND_LIST} = [];
-	push(@{$bin->{LINK_FLAGS}}, "\$($bin->{NAME}\_FULL_OBJ_LIST)");
-
-	$bin->{DEBUGDIR} = "bin";
-	$bin->{RESULT_BINARY} = $bin->{OUTPUT_BINARY} = "$bin->{DEBUGDIR}/$bin->{NAME}";
-	$bin->{TARGET_BINARY} = $bin->{RESULT_BINARY};
-	$bin->{BINARY} = $bin->{NAME};
-}
-
-sub merge_array($$)
-{
-	# $dest is a reference to an array
-	# $src is an array
-	my ($dest, $src) = @_;
-
-	return unless defined($src);
-	return unless ($#{$src} >= 0);
-
-	foreach my $line (@{$src}) {
-		next if (grep /^$line$/, @{$$dest});
-		push(@{$$dest}, $line);
-	}
-}
-
-sub create_output($$)
-{
-	my ($depend, $config) = @_;
-	my $part;
-
-	foreach $part (values %{$depend}) {
-		next unless(defined($part->{OUTPUT_TYPE}));
-
-		generate_binary($part) if grep(/BINARY/, @{$part->{OUTPUT_TYPE}});
-		generate_shared_library($part) if grep(/SHARED_LIBRARY/, @{$part->{OUTPUT_TYPE}});
-		generate_static_library($part) if grep(/STATIC_LIBRARY/, @{$part->{OUTPUT_TYPE}});
-		generate_merged_obj($part) if grep(/MERGED_OBJ/, @{$part->{OUTPUT_TYPE}});
-		$part->{OUTPUT} = $part->{"OUTPUT_" . @{$part->{OUTPUT_TYPE}}[0]};
-		$part->{TARGET} = $part->{"TARGET_" . @{$part->{OUTPUT_TYPE}}[0]};
-	}
-
-	foreach $part (values %{$depend}) {
-		next if not defined($part->{OUTPUT_TYPE});
-
-		merge_array(\$part->{FINAL_CFLAGS}, $part->{CPPFLAGS});
-		merge_array(\$part->{FINAL_CFLAGS}, $part->{CFLAGS});
-
-		foreach (@{$part->{UNIQUE_DEPENDENCIES_ALL}}) {
-			my $elem = $depend->{$_};
-			next if $elem == $part;
-
-			merge_array(\$part->{FINAL_CFLAGS}, $elem->{CPPFLAGS});
-			merge_array(\$part->{FINAL_CFLAGS}, $elem->{CFLAGS});
-		}
-
-		# Always import the link options of the unique dependencies
-		foreach (@{$part->{UNIQUE_DEPENDENCIES_LINK}}) {
-			my $elem = $depend->{$_};
-			next if $elem == $part;
-
-			push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
-			push(@{$part->{LINK_FLAGS}}, @{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
-			if (defined($elem->{OUTPUT_TYPE}) and @{$elem->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") {
-				push (@{$part->{FULL_OBJ_LIST}}, $elem->{TARGET});
-			} else {
-				push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_OUTPUT)") if defined($elem->{OUTPUT});
-				push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if (defined($elem->{TARGET}));
-			}
-		}
-	}
-
-	foreach $part (values %{$depend}) {
-		if (defined($part->{STANDARD_VISIBILITY}) and ($part->{STANDARD_VISIBILITY} ne "default") and 
-			($config->{visibility_attribute} eq "yes")) {
-		    	push(@{$part->{FINAL_CFLAGS}}, "-fvisibility=$part->{STANDARD_VISIBILITY}");
-		}
-	}
-
-	return $depend;
-}
-
-1;
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
deleted file mode 100644
index 09f5ff83ce..0000000000
--- a/source4/build/smb_build/summary.pm
+++ /dev/null
@@ -1,87 +0,0 @@
-# Samba Build System
-# - write out summary
-#
-#  Copyright (C) Jelmer Vernooij 2006
-#  Released under the GNU GPL
-
-package summary;
-use smb_build::config;
-use strict;
-
-sub enabled($)
-{
-    my ($val) = @_;
-
-    return (defined($val) && $val =~ m/yes|true/i);
-}
-
-sub showitem($$$)
-{
-	my ($output,$desc,$items) = @_;
-
-	my @need = ();
-
-	foreach (@$items) {
-		push (@need, $_) if (enabled($config::enable{$_}));
-	}
-
-	print "Support for $desc: ";
-	if ($#need >= 0) {
-		print "no (install " . join(',',@need) . ")\n";
-	} else {
-		print "yes\n";
-	}
-}
-
-sub showisexternal($$$)
-{
-	my ($output, $desc, $name) = @_;
-	print "Using external $desc: ";
-	if ($output->{$name}->{TYPE} eq "SUBSYSTEM" or
-	    $output->{$name}->{TYPE} eq "LIBRARY") {
-		print "no"; 
-	} else {
-		print "yes";
-	}
-	print "\n";
-}
-
-sub show($$)
-{
-	my ($output,$config) = @_;
-
-	print "Summary:\n\n";
-	showitem($output, "SSL in SWAT and LDAP", ["GNUTLS"]);
-	showitem($output, "threads in server (see --with-pthread)", ["PTHREAD"]);
-	showitem($output, "intelligent command line editing", ["READLINE"]);
-	showitem($output, "changing process titles (see --with-setproctitle)", ["SETPROCTITLE"]);
-	showitem($output, "using extended attributes", ["XATTR"]);
-	showitem($output, "using libblkid", ["BLKID"]);
-	showitem($output, "using iconv", ["ICONV"]);
-	showitem($output, "using pam", ["PAM"]);
-	showitem($output, "python bindings", ["LIBPYTHON"]);
-	showisexternal($output, "popt", "LIBPOPT");
-	showisexternal($output, "talloc", "LIBTALLOC");
-	showisexternal($output, "tdb", "LIBTDB");
-	showisexternal($output, "tevent", "LIBTEVENT");
-	showisexternal($output, "ldb", "LIBLDB");
-	showisexternal($output, "heimdal", "HEIMDAL_KRB5");
-	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
-	print "Automatic dependencies: ".
-	    (enabled($config->{automatic_dependencies})
-		    ? "yes" : "no (install GNU make >= 3.81 and see --enable-automatic-dependencies)") .
-	     "\n";
-	
-	print "Building shared libraries: " .
-	    (enabled($config->{BLDSHARED})
-		    ? "yes" : "no (not supported on this system)") .
-	    "\n";
-	print "Using shared libraries internally: " .
-	    (enabled($config->{USESHARED})
-		    ? "yes" : "no (specify --enable-dso)") .
-	    "\n";
-
-	print "\n";
-}
-
-1;
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
deleted file mode 100644
index 49d2a1fba3..0000000000
--- a/source4/cldap_server/config.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# CLDAP server subsystem
-#
-[MODULE::service_cldap]
-INIT_FUNCTION = server_service_cldapd_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		CLDAPD process_model LIBNETIF
-
-service_cldap_OBJ_FILES = $(addprefix $(cldap_serversrcdir)/, \
-		cldap_server.o)
-
-
-#######################
-# Start SUBSYSTEM CLDAPD
-[SUBSYSTEM::CLDAPD]
-PRIVATE_DEPENDENCIES = LIBCLI_CLDAP
-# End SUBSYSTEM CLDAPD
-#######################
-
-CLDAPD_OBJ_FILES = $(addprefix $(cldap_serversrcdir)/, \
-		netlogon.o \
-		rootdse.o)
-
-$(eval $(call proto_header_template,$(cldap_serversrcdir)/proto.h,$(CLDAPD_OBJ_FILES:.o=.c)))
diff --git a/source4/client/config.mk b/source4/client/config.mk
deleted file mode 100644
index 877544a09a..0000000000
--- a/source4/client/config.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# client subsystem
-
-#################################
-# Start BINARY smbclient
-[BINARY::smbclient]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		SMBREADLINE \
-		LIBSAMBA-UTIL \
-		LIBCLI_SMB \
-		RPC_NDR_SRVSVC \
-		LIBCLI_LSA \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBCLI_RAW 
-# End BINARY smbclient
-#################################
-
-smbclient_OBJ_FILES = $(clientsrcdir)/client.o
-
-#################################
-# Start BINARY cifsdd
-[BINARY::cifsdd]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBCLI_SMB \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS
-# End BINARY sdd
-#################################
-
-cifsdd_OBJ_FILES = $(addprefix $(clientsrcdir)/, cifsdd.o cifsddio.o)
diff --git a/source4/cluster/config.mk b/source4/cluster/config.mk
deleted file mode 100644
index bbf45180eb..0000000000
--- a/source4/cluster/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::CLUSTER]
-PRIVATE_DEPENDENCIES = TDB_WRAP
-
-CLUSTER_OBJ_FILES = $(addprefix $(clustersrcdir)/, cluster.o local.o)
diff --git a/source4/config.guess b/source4/config.guess
deleted file mode 100755
index da83314608..0000000000
--- a/source4/config.guess
+++ /dev/null
@@ -1,1561 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2009-04-27'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd | genuineintel)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/source4/config.sub b/source4/config.sub
deleted file mode 100755
index a39437d015..0000000000
--- a/source4/config.sub
+++ /dev/null
@@ -1,1686 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2009-04-17'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/source4/configure.ac b/source4/configure.ac
deleted file mode 100644
index bdbbb30d71..0000000000
--- a/source4/configure.ac
+++ /dev/null
@@ -1,220 +0,0 @@
-dnl -*- mode: m4-mode -*-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.54)
-
-AC_INIT([samba],[4],[samba-technical@samba.org])
-
-AC_CONFIG_SRCDIR([include/includes.h])
-AC_CONFIG_HEADER(include/config_tmp.h)
-AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h.])
-
-# Configuration rules.
-m4_include(build/m4/env.m4)
-m4_include(../lib/replace/samba.m4)
-m4_include(../libcli/smbreadline/readline.m4)
-m4_include(heimdal_build/config.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/popt/samba.m4)
-m4_include(../lib/util/charset/config.m4)
-m4_include(lib/socket/config.m4)
-m4_include(../lib/zlib/zlib.m4)
-AC_ZLIB([
-SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}])
-],[
-SMB_INCLUDE_MK(lib/zlib.mk)
-])
-m4_include(../nsswitch/nsstest.m4)
-m4_include(../pidl/config.m4)
-
-AC_CONFIG_FILES(lib/registry/registry.pc)
-AC_CONFIG_FILES(lib/policy/policy.pc)
-AC_CONFIG_FILES(librpc/dcerpc.pc)
-AC_CONFIG_FILES(../librpc/ndr.pc)
-AC_CONFIG_FILES(../librpc/ndr_standard.pc)
-AC_CONFIG_FILES(../lib/torture/torture.pc)
-AC_CONFIG_FILES(auth/gensec/gensec.pc)
-AC_CONFIG_FILES(param/samba-hostconfig.pc)
-AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
-AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
-
-m4_include(min_versions.m4)
-
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= TALLOC_MIN_VERSION, [],
-	[
-		m4_include(../lib/talloc/libtalloc.m4)
-		SMB_INCLUDE_MK(../lib/talloc/config.mk)
-	]
-)
-
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION,
-	[
-		AC_MSG_CHECKING([for Python TDB bindings])
-		if $PYTHON -c "from tdb import open" 2>/dev/null; then
-			AC_MSG_RESULT(yes)
-		else
-			SMB_INCLUDE_MK(../lib/tdb/python.mk) 
-			AC_MSG_RESULT(no)
-		fi
-	 ],
-	[
-		m4_include(../lib/tdb/libtdb.m4)
-		SMB_INCLUDE_MK(../lib/tdb/config.mk)
-		SMB_INCLUDE_MK(../lib/tdb/python.mk) 
-	]
-)
-
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
-	[],[m4_include(../lib/tevent/samba.m4)]
-)
-
-SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
-	[
-		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
-		SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
-		define_ldb_modulesdir=no
-		AC_MSG_CHECKING([for Python LDB bindings])
-		if $PYTHON -c "import ldb" 2>/dev/null; then
-			AC_MSG_RESULT(yes)
-		else
-			SMB_INCLUDE_MK(lib/ldb/python.mk) 
-			AC_MSG_RESULT(no)
-		fi
-
-	],
-	[
-		# 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 useful 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=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(lib/ldb/ldb.pc)
-		SMB_INCLUDE_MK(lib/ldb/python.mk) 
-	])
-
-m4_include(lib/tls/config.m4)
-m4_include(torture/libnetapi/config.m4)
-m4_include(torture/libsmbclient/config.m4)
-
-dnl m4_include(auth/kerberos/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(../lib/socket_wrapper/config.m4)
-m4_include(../lib/nss_wrapper/config.m4)
-m4_include(../lib/uid_wrapper/config.m4)
-dnl nsswitch must be before auth as it sets some variable
-dnl tested by auth/config.m4, libiiniparser must be even before
-dnl because nsswitch depend also on it
-m4_include(../lib/iniparser_build/config.m4)
-m4_include(../nsswitch/config.m4)
-m4_include(auth/config.m4)
-m4_include(kdc/config.m4)
-m4_include(ntvfs/sysdep/config.m4)
-
-#################################################
-# add *_CFLAGS only for the real build
-CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"
-
-#################################################
-# final configure stuff
-
-AC_MSG_CHECKING([configure summary])
-AC_TRY_RUN([#include "${srcdir-.}/../tests/summary.c"],
-           AC_MSG_RESULT(yes),
-	   AC_MSG_ERROR([summary failure. Aborting config]); exit 1;,
-	   AC_MSG_WARN([cannot run when cross-compiling]))
-
-LIBS=`echo $LIBS | sed -e 's/ *//g'`
-if test x"$LIBS" != x""; then
-	echo "LIBS: $LIBS"
-	AC_MSG_WARN([the global \$LIBS variable contains some libraries!])
-	AC_MSG_WARN([this should not happen, please report to samba-technical@lists.samba.org!])
-	AC_MSG_ERROR([only _EXT macros from aclocal.m4 should be used!])
-fi
-
-dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
-LIB_REMOVE_USR_LIB(LDFLAGS)
-LIB_REMOVE_USR_LIB(LIBS)
-
-dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
-CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
-CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
-
-AC_SUBST(ac_default_prefix)
-
-for d in build/smb_build bin include ; do
-    test -d ${builddir}/$d || AS_MKDIR_P(${builddir}/$d)
-done
-
-AC_SUBST(INTERN_LDFLAGS)
-AC_SUBST(INSTALL_LINK_FLAGS)
-if test $USESHARED = "true";
-then
-	INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
-	INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
-else
-	INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
-fi
-
-builddir_headers=""
-	
-if test "x$ac_abs_srcdir" != "x$ac_abs_builddir"
-then
-	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)/../lib/talloc -I\$(srcdir)/.. -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
-
-SMB_WRITE_PERLVARS(build/smb_build/config.pm)
-
-echo "configure: creating config.mk"
-cat >config.mk<<CEOF
-# config.mk - Autogenerated by configure, DO NOT EDIT!
-$SMB_INFO_EXT_LIBS
-$SMB_INFO_SUBSYSTEMS
-$SMB_INFO_LIBRARIES
-CEOF
-
-SMB_BUILD_RUN(data.mk)
-AC_OUTPUT(Makefile)
-
-cmp include/config_tmp.h include/config.h >/dev/null 2>&1
-CMP_RET=$?
-if test $CMP_RET != 0; then
-	cp include/config_tmp.h include/config.h
-fi
-
-SMB_WRITE_MAKEVARS(mkconfig.mk)
-
-if test $USESHARED = true
-then
-	echo "To run binaries without installing, set the following environment variable:"
-	echo "$LIB_PATH_VAR=$builddir/bin/shared"
-fi
-
-echo
-echo "To build Samba, run $MAKE"
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
deleted file mode 100644
index e12193d524..0000000000
--- a/source4/dsdb/config.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# Directory Service subsystem
-
-mkinclude samdb/ldb_modules/config.mk
-
-################################################
-# Start SUBSYSTEM SAMDB
-[SUBSYSTEM::SAMDB]
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5  
-PRIVATE_DEPENDENCIES = LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
-					   auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
-					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON \
-						LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL 
-
-
-SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \
-		samdb/samdb.o \
-		samdb/samdb_privilege.o \
-		samdb/cracknames.o \
-		repl/replicated_objects.o)
-
-$(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/samdb_proto.h,$(SAMDB_OBJ_FILES:.o=.c)))
-# PUBLIC_HEADERS += dsdb/samdb/samdb.h
-
-[SUBSYSTEM::SAMDB_COMMON]
-PRIVATE_DEPENDENCIES = LIBLDB NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH
-
-SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
-		util.o \
-		dsdb_dn.o \
-		dsdb_access.o) \
-		../libds/common/flag_mapping.o
-$(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::SAMDB_SCHEMA]
-PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA
-
-SAMDB_SCHEMA_OBJ_FILES = $(addprefix $(dsdbsrcdir)/schema/, \
-		schema_init.o \
-		schema_set.o \
-		schema_query.o \
-		schema_syntax.o \
-		schema_description.o \
-		schema_convert_to_ol.o \
-		schema_inferiors.o \
-		schema_prefixmap.o \
-		schema_info_attr.o \
-		schema_filtered.o)
-
-$(eval $(call proto_header_template,$(dsdbsrcdir)/schema/proto.h,$(SAMDB_SCHEMA_OBJ_FILES:.o=.c)))
-# PUBLIC_HEADERS += dsdb/schema/schema.h
-
-#######################
-# Start SUBSYSTEM DREPL_SRV
-[MODULE::DREPL_SRV]
-INIT_FUNCTION = server_service_drepl_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		process_model \
-		RPC_NDR_DRSUAPI
-# End SUBSYSTEM DREPL_SRV
-#######################
-
-DREPL_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/repl/, \
-		drepl_service.o \
-		drepl_periodic.o \
-		drepl_partitions.o \
-		drepl_out_pull.o \
-		drepl_out_helpers.o \
-		drepl_notify.o \
-		drepl_ridalloc.o \
-		drepl_fsmo.o)
-
-$(eval $(call proto_header_template,$(dsdbsrcdir)/repl/drepl_service_proto.h,$(DREPL_SRV_OBJ_FILES:.o=.c)))
-
-#######################
-# Start SUBSYSTEM KCC_SRV
-[MODULE::KCC_SRV]
-INIT_FUNCTION = server_service_kcc_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		process_model \
-		RPC_NDR_DRSUAPI
-# End SUBSYSTEM KCC_SRV
-#######################
-
-KCC_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/kcc/, \
-		kcc_service.o \
-		kcc_connection.o \
-		kcc_topology.o \
-		kcc_deleted.o \
-		kcc_periodic.o \
-		kcc_drs_replica_info.o)
-
-$(eval $(call proto_header_template,$(dsdbsrcdir)/kcc/kcc_service_proto.h,$(KCC_SRV_OBJ_FILES:.o=.c)))
-
-#######################
-# Start SUBSYSTEM DNS_UPDATE_SRV
-[MODULE::DNS_UPDATE_SRV]
-INIT_FUNCTION = server_service_dnsupdate_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		process_model \
-		UTIL_RUNCMD
-# End SUBSYSTEM DNS_UPDATE_SRV
-#######################
-
-DNS_UPDATE_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/dns/, \
-		dns_update.o)
-
-[PYTHON::python_dsdb]
-LIBRARY_REALNAME = samba/dsdb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = SAMDB pyldb
-
-python_dsdb_OBJ_FILES = $(dsdbsrcdir)/pydsdb.o
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
deleted file mode 100644
index 442481fc6b..0000000000
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ /dev/null
@@ -1,465 +0,0 @@
-################################################
-# Start SUBSYSTEM DSDB_MODULE_HELPERS
-[SUBSYSTEM::DSDB_MODULE_HELPERS]
-PRIVATE_DEPENDENCIES = LIBLDB LIBNDR SAMDB_SCHEMA MESSAGING
-
-DSDB_MODULE_HELPERS_OBJ_FILES = \
-	$(dsdbsrcdir)/samdb/ldb_modules/util.o \
-	$(dsdbsrcdir)/samdb/ldb_modules/ridalloc.o \
-	$(dsdbsrcdir)/samdb/ldb_modules/acl_util.o
-
-$(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/ldb_modules/util_proto.h,$(DSDB_MODULE_HELPERS_OBJ_FILES:.o=.c)))
-
-
-################################################
-# Start MODULE ldb_samba_dsdb
-[MODULE::ldb_samba_dsdb]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS LIBNDR DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(samba_dsdb)
-# End MODULE ldb_samba_dsdb
-################################################
-
-ldb_samba_dsdb_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/samba_dsdb.o
-
-################################################
-# Start MODULE ldb_samba_secrets
-[MODULE::ldb_samba_secrets]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS LIBNDR
-INIT_FUNCTION = LDB_MODULE(samba_secrets)
-# End MODULE ldb_samba_secrets
-################################################
-
-ldb_samba_secrets_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/samba_secrets.o
-
-################################################
-# Start MODULE ldb_objectguid
-[MODULE::ldb_objectguid]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS LIBNDR
-INIT_FUNCTION = LDB_MODULE(objectguid)
-# End MODULE ldb_objectguid
-################################################
-
-ldb_objectguid_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectguid.o
-
-################################################
-# Start MODULE ldb_repl_meta_data
-[MODULE::ldb_repl_meta_data]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS \
-			LIBNDR NDR_DRSUAPI \
-			NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(repl_meta_data)
-# End MODULE ldb_repl_meta_data
-################################################
-
-ldb_repl_meta_data_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/repl_meta_data.o
-
-################################################
-# Start MODULE ldb_dsdb_cache
-[MODULE::ldb_dsdb_cache]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS
-INIT_FUNCTION = LDB_MODULE(dsdb_cache)
-# End MODULE ldb_dsdb_cache
-################################################
-
-ldb_dsdb_cache_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/dsdb_cache.o
-
-################################################
-# Start MODULE ldb_schema_load
-[MODULE::ldb_schema_load]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(schema_load)
-# End MODULE ldb_schema_load
-################################################
-
-ldb_schema_load_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/schema_load.o
-
-################################################
-# Start MODULE ldb_schema_data
-[MODULE::ldb_schema_data]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(schema_data)
-# End MODULE ldb_schema_data
-################################################
-
-ldb_schema_data_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/schema_data.o
-
-################################################
-# Start MODULE ldb_naming_fsmo
-[MODULE::ldb_naming_fsmo]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(naming_fsmo)
-# End MODULE ldb_naming_fsmo
-################################################
-
-ldb_naming_fsmo_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/naming_fsmo.o
-
-################################################
-# Start MODULE ldb_pdc_fsmo
-[MODULE::ldb_pdc_fsmo]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(pdc_fsmo)
-# End MODULE ldb_pdc_fsmo
-################################################
-
-ldb_pdc_fsmo_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/pdc_fsmo.o
-
-################################################
-# Start MODULE ldb_samldb
-[MODULE::ldb_samldb]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LDAP_ENCODE SAMDB DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(samldb)
-#
-# End MODULE ldb_samldb
-################################################
-
-ldb_samldb_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/samldb.o
-
-################################################
-# Start MODULE ldb_samba3sam
-[MODULE::ldb_samba3sam]
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(samba3sam)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB SMBPASSWD \
-			NSS_WRAPPER LIBSECURITY NDR_SECURITY
-# End MODULE ldb_samba3sam
-################################################
-
-ldb_samba3sam_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/samba3sam.o
-
-################################################
-# Start MODULE ldb_samba3sid
-[MODULE::ldb_samba3sid]
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(samba3sid)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB SMBPASSWD \
-			NSS_WRAPPER LIBSECURITY NDR_SECURITY
-# End MODULE ldb_samba3sid
-################################################
-
-ldb_samba3sid_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/samba3sid.o
-
-################################################
-# Start MODULE ldb_simple_ldap_map
-[MODULE::ldb_simple_ldap_map]
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB LIBNDR
-ENABLE = YES
-ALIASES = entryuuid nsuniqueid
-# End MODULE ldb_entryuuid
-################################################
-
-ldb_simple_ldap_map_OBJ_FILES = \
-		$(dsdbsrcdir)/samdb/ldb_modules/simple_ldap_map.o
-
-# ################################################
-# # Start MODULE ldb_proxy
-# [MODULE::ldb_proxy]
-# SUBSYSTEM = LIBLDB
-# INIT_FUNCTION = LDB_MODULE(proxy)
-# OBJ_FILES = \
-# 		proxy.o
-# 
-# # End MODULE ldb_proxy
-# ################################################
-
-
-################################################
-# Start MODULE ldb_rootdse
-[MODULE::ldb_rootdse]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SAMDB
-INIT_FUNCTION = LDB_MODULE(rootdse)
-# End MODULE ldb_rootdse
-################################################
-
-ldb_rootdse_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/rootdse.o
-
-################################################
-# Start MODULE ldb_password_hash
-[MODULE::ldb_password_hash]
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(password_hash)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SAMDB LDAP_ENCODE \
-			LIBCLI_AUTH NDR_DRSBLOBS KERBEROS \
-			HEIMDAL_HDB_KEYS HEIMDAL_KRB5
-# End MODULE ldb_password_hash
-################################################
-
-ldb_password_hash_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/password_hash.o
-
-################################################
-# Start MODULE ldb_local_password
-[MODULE::ldb_local_password]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBNDR SAMDB
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(local_password)
-# End MODULE ldb_local_password
-################################################
-
-ldb_local_password_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/local_password.o
-
-################################################
-# Start MODULE ldb_extended_dn_in
-[MODULE::ldb_extended_dn_in]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL
-INIT_FUNCTION = LDB_MODULE(extended_dn_in)
-# End MODULE ldb_extended_dn_in
-################################################
-
-ldb_extended_dn_in_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/extended_dn_in.o
-
-################################################
-# Start MODULE ldb_extended_dn_out
-[MODULE::ldb_extended_dn_out]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB
-INIT_FUNCTION = LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)
-ENABLE = YES
-ALIASES = extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds
-# End MODULE ldb_extended_dn_out
-################################################
-
-ldb_extended_dn_out_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/extended_dn_out.o
-
-################################################
-# Start MODULE ldb_extended_dn_store
-[MODULE::ldb_extended_dn_store]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(extended_dn_store)
-# End MODULE ldb_extended_dn_store
-################################################
-
-ldb_extended_dn_store_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/extended_dn_store.o
-
-################################################
-# Start MODULE ldb_show_deleted
-[MODULE::ldb_show_deleted]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL
-INIT_FUNCTION = LDB_MODULE(show_deleted)
-# End MODULE ldb_show_deleted
-################################################
-
-ldb_show_deleted_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/show_deleted.o
-
-################################################
-# Start MODULE ldb_partition
-[MODULE::ldb_partition]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SAMDB DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(partition)
-# End MODULE ldb_partition
-################################################
-
-ldb_partition_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/partition.o \
-			  $(dsdbsrcdir)/samdb/ldb_modules/partition_init.o
-$(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/ldb_modules/partition_proto.h,$(ldb_partition_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE ldb_partition
-[MODULE::ldb_new_partition]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SAMDB DSDB_MODULE_HELPERS
-INIT_FUNCTION = LDB_MODULE(new_partition)
-# End MODULE ldb_partition
-################################################
-
-ldb_new_partition_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/new_partition.o 
-
-################################################
-# Start MODULE ldb_update_kt
-[MODULE::ldb_update_keytab]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS CREDENTIALS
-#Also depends on credentials, but that would loop
-INIT_FUNCTION = LDB_MODULE(update_keytab)
-# End MODULE ldb_update_kt
-################################################
-
-ldb_update_keytab_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/update_keytab.o 
-
-################################################
-# Start MODULE ldb_objectclass
-[MODULE::ldb_objectclass]
-INIT_FUNCTION = LDB_MODULE(objectclass)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_objectclass
-################################################
-
-ldb_objectclass_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectclass.o
-
-################################################
-# Start MODULE ldb_subtree_rename
-[MODULE::ldb_subtree_rename]
-INIT_FUNCTION = LDB_MODULE(subtree_rename)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_subtree_rename
-################################################
-
-ldb_subtree_rename_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_rename.o
-
-################################################
-# Start MODULE ldb_subtree_rename
-[MODULE::ldb_subtree_delete]
-INIT_FUNCTION = LDB_MODULE(subtree_delete)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_subtree_rename
-################################################
-
-ldb_subtree_delete_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_delete.o
-
-################################################
-# Start MODULE ldb_linked_attributes
-[MODULE::ldb_linked_attributes]
-INIT_FUNCTION = LDB_MODULE(linked_attributes)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SAMDB DSDB_MODULE_HELPERS
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_linked_attributes
-################################################
-
-ldb_linked_attributes_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/linked_attributes.o
-
-################################################
-# Start MODULE ldb_ranged_results
-[MODULE::ldb_ranged_results]
-INIT_FUNCTION = LDB_MODULE(ranged_results)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_ranged_results
-################################################
-
-ldb_ranged_results_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/ranged_results.o
-
-################################################
-# Start MODULE ldb_anr
-[MODULE::ldb_anr]
-INIT_FUNCTION = LDB_MODULE(anr)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL SAMDB
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_anr
-################################################
-
-ldb_anr_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/anr.o
-
-################################################
-# Start MODULE ldb_instancetype
-[MODULE::ldb_instancetype]
-INIT_FUNCTION = LDB_MODULE(instancetype)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSAMBA-UTIL SAMDB
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_instancetype
-################################################
-
-ldb_instancetype_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/instancetype.o
-
-################################################
-# Start MODULE ldb_operational
-[MODULE::ldb_operational]
-SUBSYSTEM = LIBLDB
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth_session auth
-INIT_FUNCTION = LDB_MODULE(operational)
-# End MODULE ldb_operational
-################################################
-
-ldb_operational_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/operational.o
-
-################################################
-# Start MODULE ldb_descriptor
-[MODULE::ldb_descriptor]
-INIT_FUNCTION = LDB_MODULE(descriptor)
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB \
-	DSDB_MODULE_HELPERS
-SUBSYSTEM = LIBLDB
-# End MODULE ldb_descriptor
-################################################
-
-ldb_descriptor_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/descriptor.o
-
-################################################
-# Start MODULE ldb_resolve_oids
-[MODULE::ldb_resolve_oids]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBEVENTS LIBNDR
-INIT_FUNCTION = LDB_MODULE(resolve_oids)
-# End MODULE ldb_resolve_oids
-################################################
-
-ldb_resolve_oids_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/resolve_oids.o
-
-################################################
-# Start MODULE ldb_acl
-[MODULE::ldb_acl]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSECURITY SAMDB
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(acl)
-# End MODULE ldb_acl
-################################################
-
-ldb_acl_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/acl.o
-
-################################################
-# Start MODULE ldb_lazy_commit
-[MODULE::ldb_lazy_commit]
-PRIVATE_DEPENDENCIES = SAMDB
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(lazy_commit)
-
-# End MODULE ldb_lazy_commit
-################################################
-
-ldb_lazy_commit_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/lazy_commit.o
-
-# Start MODULE ldb_validate_update
-[MODULE::ldb_validate_update]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSECURITY SAMDB
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(validate_update)
-# End MODULE ldb_validate_update
-################################################
-
-ldb_validate_update_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/validate_update.o
-
-################################################
-# Start MODULE ldb_aclread
-[MODULE::ldb_aclread]
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBSECURITY SAMDB
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(aclread)
-# End MODULE ldb_acl
-################################################
-
-ldb_acl_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/acl_read.o
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
deleted file mode 100644
index c4738b8957..0000000000
--- a/source4/dynconfig/config.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-[SUBSYSTEM::DYNCONFIG]
-
-DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o
-
-# set these to where to find various files
-# These can be overridden by command line switches (see samba(8))
-# or in smb.conf (see smb.conf(5))
-CONFIG4FILE = $(sysconfdir)/smb.conf
-pkgconfigdir = $(libdir)/pkgconfig
-LMHOSTSFILE4 = $(sysconfdir)/lmhosts
-
-$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR=\"$(bindir)\" \
-	 -DSBINDIR=\"$(sbindir)\" \
-	 -DLMHOSTSFILE=\"$(LMHOSTSFILE4)\" \
-	 -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
-	 -DLOGFILEBASE=\"$(logfilebase)\" \
-	 -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(ncalrpcdir)\" \
-	 -DSWATDIR=\"$(swatdir)\" \
-	 -DPRIVATE_DIR=\"$(privatedir)\" \
-	 -DMODULESDIR=\"$(modulesdir)\" \
-	 -DSETUPDIR=\"$(setupdir)\" \
-	 -DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(winbindd_privileged_socket_dir)\" \
-	 -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \
-	 -DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\" \
-	 -DPYTHONDIR=\"$(pythondir)\" \
-	 -DCODEPAGEDIR=\"$(codepagedir)\" \
-	 -DLIBDIR=\"$(libdir)\" \
-	 -DSTATEDIR=\"$(localstatedir)\" \
-	 -DCACHEDIR=\"$(cachedir)\" \
-	 -DSMB_PASSWD_FILE=\"$(privatedir)/smbpasswd\"
diff --git a/source4/headermap.txt b/source4/headermap.txt
deleted file mode 100644
index e8dbbce7cb..0000000000
--- a/source4/headermap.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-# FIXME: This file should be autogenerated by the build system at some 
-# point
-../lib/util/util.h: util.h
-../lib/util/debug.h: util/debug.h
-../lib/util/mutex.h: util/mutex.h
-../lib/util/attr.h: util/attr.h
-../lib/util/byteorder.h: util/byteorder.h
-../lib/util/safe_string.h: util/safe_string.h
-../lib/util/memory.h: util/memory.h
-../lib/util/talloc_stack.h: util/talloc_stack.h
-../lib/util/xfile.h: util/xfile.h
-../lib/tdr/tdr.h: tdr.h
-../lib/tsocket/tsocket.h: tsocket.h
-../lib/tsocket/tsocket_internal.h: tsocket_internal.h
-librpc/rpc/dcerpc.h: dcerpc.h
-lib/ldb/include/ldb.h: ldb.h
-lib/ldb/include/ldb_errors.h: ldb_errors.h
-auth/gensec/gensec.h: gensec.h
-../librpc/ndr/libndr.h: ndr.h
-librpc/ndr/libndr.h: ndr.h
-lib/registry/registry.h: registry.h
-../libcli/util/werror.h: core/werror.h
-../libcli/util/doserr.h: core/doserr.h
-../libcli/util/ntstatus.h: core/ntstatus.h
-libcli/util/werror.h: core/werror.h
-libcli/util/doserr.h: core/doserr.h
-libcli/util/ntstatus.h: core/ntstatus.h
-../libcli/cldap/cldap.h: cldap.h
-auth/credentials/credentials.h: credentials.h
-auth/credentials/credentials_krb5.h: credentials/krb5.h
-rpc_server/dcerpc_server.h: dcerpc_server.h
-rpc_server/common/common.h: dcerpc_server/common.h
-../libcli/auth/credentials.h: domain_credentials.h
-../lib/util/charset/charset.h: charset.h
-libcli/ldap/libcli_ldap.h: ldap-util.h
-../lib/torture/torture.h: torture.h
-libcli/libcli.h: client.h
-librpc/gen_ndr/ntp_signd.h: gen_ndr/ntp_signd.h
-lib/cmdline/popt_common.h: samba/popt.h
-../lib/util/dlinklist.h: dlinklist.h
-../lib/util/data_blob.h: util/data_blob.h
-../lib/util/time.h: util/time.h
-../lib/util/tevent_ntstatus.h: util/tevent_ntstatus.h
-../lib/util/tevent_unix.h: util/tevent_unix.h
-version.h: samba/version.h
-param/param.h: param.h
-../lib/util/asn1.h: samba/asn1.h
-../libcli/util/error.h: core/error.h
-lib/tdb_wrap.h: tdb_wrap.h
-lib/ldb_wrap.h: ldb_wrap.h
-torture/smbtorture.h: smbtorture.h
-param/share.h: share.h
-../lib/util/util_tdb.h: util_tdb.h
-../lib/util/util_ldb.h: util_ldb.h
-../lib/util/wrap_xattr.h: wrap_xattr.h
-../libcli/ldap/ldap_message.h: ldap_message.h
-../libcli/ldap/ldap_errors.h: ldap_errors.h
-../libcli/ldap/ldap_ndr.h: ldap_ndr.h
-../tevent/tevent.h: tevent.h
-../lib/tevent/tevent.h: tevent.h
-../lib/tevent/tevent_internal.h: tevent_internal.h
-auth/session.h: samba/session.h
-../talloc/talloc.h: talloc.h
-
-# pidl generated files
-# we need some of them with and without '../'
-librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
-librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h
-librpc/gen_ndr/winbind.h: gen_ndr/winbind.h
-librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
-librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
-librpc/gen_ndr/mgmt.h: gen_ndr/mgmt.h
-librpc/gen_ndr/ndr_mgmt.h: gen_ndr/ndr_mgmt.h
-librpc/gen_ndr/ndr_mgmt_c.h: gen_ndr/ndr_mgmt_c.h
-librpc/gen_ndr/epmapper.h: gen_ndr/epmapper.h
-librpc/gen_ndr/ndr_epmapper.h: gen_ndr/ndr_epmapper.h
-librpc/gen_ndr/ndr_epmapper_c.h: gen_ndr/ndr_epmapper_c.h
-librpc/gen_ndr/ndr_atsvc.h: gen_ndr/ndr_atsvc.h
-librpc/gen_ndr/atsvc.h: gen_ndr/atsvc.h
-librpc/gen_ndr/ndr_atsvc_c.h: gen_ndr/ndr_atsvc_c.h
-librpc/gen_ndr/misc.h: gen_ndr/misc.h
-librpc/gen_ndr/lsa.h: gen_ndr/lsa.h
-librpc/gen_ndr/samr.h: gen_ndr/samr.h
-librpc/gen_ndr/ndr_samr.h: gen_ndr/ndr_samr.h
-librpc/gen_ndr/ndr_samr_c.h: gen_ndr/ndr_samr_c.h
-librpc/gen_ndr/security.h: gen_ndr/security.h
-librpc/gen_ndr/server_id.h: gen_ndr/server_id.h
-librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
-librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
-librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h
-librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h
-../librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
-../librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h
-../librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
-../librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
-../librpc/gen_ndr/mgmt.h: gen_ndr/mgmt.h
-../librpc/gen_ndr/ndr_mgmt.h: gen_ndr/ndr_mgmt.h
-../librpc/gen_ndr/ndr_mgmt_c.h: gen_ndr/ndr_mgmt_c.h
-../librpc/gen_ndr/epmapper.h: gen_ndr/epmapper.h
-../librpc/gen_ndr/ndr_epmapper.h: gen_ndr/ndr_epmapper.h
-../librpc/gen_ndr/ndr_epmapper_c.h: gen_ndr/ndr_epmapper_c.h
-../librpc/gen_ndr/ndr_atsvc.h: gen_ndr/ndr_atsvc.h
-../librpc/gen_ndr/atsvc.h: gen_ndr/atsvc.h
-../librpc/gen_ndr/ndr_atsvc_c.h: gen_ndr/ndr_atsvc_c.h
-../librpc/gen_ndr/misc.h: gen_ndr/misc.h
-../librpc/gen_ndr/lsa.h: gen_ndr/lsa.h
-../librpc/gen_ndr/samr.h: gen_ndr/samr.h
-../librpc/gen_ndr/ndr_samr.h: gen_ndr/ndr_samr.h
-../librpc/gen_ndr/ndr_samr_c.h: gen_ndr/ndr_samr_c.h
-../librpc/gen_ndr/security.h: gen_ndr/security.h
-../librpc/gen_ndr/server_id.h: gen_ndr/server_id.h
-../librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
-../librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
-../librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h
-../librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h
diff --git a/source4/heimdal/cf/check-var.m4 b/source4/heimdal/cf/check-var.m4
deleted file mode 100644
index 2fd7bca6f0..0000000000
--- a/source4/heimdal/cf/check-var.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl $Id$
-dnl
-dnl rk_CHECK_VAR(variable, includes)
-AC_DEFUN([rk_CHECK_VAR], [
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_var_$1, [
-m4_ifval([$2],[
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2
-	void * foo(void) { return &$1; }]],[[foo()]])],
-	    [ac_cv_var_$1=yes],[ac_cv_var_$1=no])])
-if test "$ac_cv_var_$1" != yes ; then
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2
-extern int $1;
-int foo(void) { return $1; }]],[[foo()]])],
-	    [ac_cv_var_$1=yes],[ac_cv_var_$1=no])
-fi
-])
-ac_foo=`eval echo \\$ac_cv_var_$1`
-AC_MSG_RESULT($ac_foo)
-if test "$ac_foo" = yes; then
-	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
-		[Define if you have the `]$1[' variable.])
-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
-fi
-])
-
-AC_WARNING_ENABLE([obsolete])
-AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo])
diff --git a/source4/heimdal/cf/find-func-no-libs.m4 b/source4/heimdal/cf/find-func-no-libs.m4
deleted file mode 100644
index f3413409f6..0000000000
--- a/source4/heimdal/cf/find-func-no-libs.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-dnl $Id$
-dnl
-dnl
-dnl Look for function in any of the specified libraries
-dnl
-
-dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
-AC_DEFUN([AC_FIND_FUNC_NO_LIBS], [
-AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])
diff --git a/source4/heimdal/cf/find-func-no-libs2.m4 b/source4/heimdal/cf/find-func-no-libs2.m4
deleted file mode 100644
index 692001c103..0000000000
--- a/source4/heimdal/cf/find-func-no-libs2.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl $Id$
-dnl
-dnl
-dnl Look for function in any of the specified libraries
-dnl
-
-dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments, extra libs, extra args)
-AC_DEFUN([AC_FIND_FUNC_NO_LIBS2], [
-
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_funclib_$1,
-[
-if eval "test \"\$ac_cv_func_$1\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in $2; do
-		case "$ac_lib" in
-		"") ;;
-		yes) ac_lib="" ;;
-		no) continue ;;
-		-l*) ;;
-		*) ac_lib="-l$ac_lib" ;;
-		esac
-		LIBS="$6 $ac_lib $5 $ac_save_LIBS"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break])
-	done
-	eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
-	LIBS="$ac_save_LIBS"
-fi
-])
-
-eval "ac_res=\$ac_cv_funclib_$1"
-
-if false; then
-	AC_CHECK_FUNCS($1)
-dnl	AC_CHECK_LIBS($2, foo)
-fi
-# $1
-eval "ac_tr_func=HAVE_[]upcase($1)"
-eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')"
-eval "LIB_$1=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_$1=yes"
-	eval "LIB_$1="
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_MSG_RESULT([yes])
-	;;
-	no)
-	eval "ac_cv_func_$1=no"
-	eval "LIB_$1="
-	AC_MSG_RESULT([no])
-	;;
-	*)
-	eval "ac_cv_func_$1=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_DEFINE_UNQUOTED($ac_tr_lib)
-	AC_MSG_RESULT([yes, in $ac_res])
-	;;
-esac
-AC_SUBST(LIB_$1)
-])
diff --git a/source4/heimdal/cf/find-func.m4 b/source4/heimdal/cf/find-func.m4
deleted file mode 100644
index 865772a700..0000000000
--- a/source4/heimdal/cf/find-func.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-dnl $Id$
-dnl
-dnl AC_FIND_FUNC(func, libraries, includes, arguments)
-AC_DEFUN([AC_FIND_FUNC], [
-AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
-if test -n "$LIB_$1"; then
-	LIBS="$LIB_$1 $LIBS"
-fi
-])
diff --git a/source4/heimdal/cf/resolv.m4 b/source4/heimdal/cf/resolv.m4
deleted file mode 100644
index 49c868ab0e..0000000000
--- a/source4/heimdal/cf/resolv.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-dnl stuff used by DNS resolv code in roken
-dnl
-dnl $Id$
-dnl
-
-AC_DEFUN([rk_RESOLV],[
-
-AC_CHECK_HEADERS([arpa/nameser.h dns.h])
-
-AC_CHECK_HEADERS(resolv.h, , , [AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-])
-
-AC_FIND_FUNC(res_search, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
-
-AC_FIND_FUNC(res_nsearch, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0,0])
-
-AC_FIND_FUNC(res_ndestroy, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0])
-
-AC_FIND_FUNC_NO_LIBS(dns_search,,
-[
-#ifdef HAVE_DNS_H
-#include <dns.h>
-#endif
-],
-[0,0,0,0,0,0,0,0])
-
-
-AC_FIND_FUNC(dn_expand, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
-
-rk_CHECK_VAR(_res, 
-[#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif])
-
-])
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
deleted file mode 100644
index 99aed8c093..0000000000
--- a/source4/heimdal_build/config.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-
-external_heimdal=no
-AC_MSG_CHECKING([Whether to use external heimdal libraries])
-AC_ARG_ENABLE(external-heimdal,
-[  --enable-external-heimdal Enable external heimdal libraries (experimental,default=no)],
-[ external_heimdal=$enableval ],
-[ external_heimdal=no ])
-AC_MSG_RESULT($external_heimdal)
-
-if test x"$external_heimdal" = x"yes"; then
-
-# external_heimdal_start
-m4_include(heimdal_build/external.m4)
-# external_heimdal_end
-
-else
-
-# internal_heimdal_start
-m4_include(heimdal_build/internal.m4)
-# internal_heimdal_end
-
-fi
-
diff --git a/source4/heimdal_build/external.m4 b/source4/heimdal_build/external.m4
deleted file mode 100644
index ad9443f999..0000000000
--- a/source4/heimdal_build/external.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is every experimental
-# We should really add configure checks
-# to verify the installed heimdal libraries
-# are good enough for our usage!!!
-
-HEIMDAL_KRB5_LIBS="-lkrb5 -lcom_err"
-HEIMDAL_KRB5_CFLAGS=""
-HEIMDAL_KRB5_CPPFLAGS=""
-HEIMDAL_KRB5_LDFLAGS=""
-SMB_EXT_LIB(HEIMDAL_KRB5,
-	    [${HEIMDAL_KRB5_LIBS}],
-	    [${HEIMDAL_KRB5_CFLAGS}],
-	    [${HEIMDAL_KRB5_CPPFLAGS}],
-	    [${HEIMDAL_KRB5_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_KRB5,YES)
-AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
-HAVE_KRB5=YES
-AC_DEFINE(HAVE_COM_ERR,1,[Whether com_err is available])
-HAVE_COM_ERR=YES
-
-HEIMDAL_GSSAPI_LIBS="-lgssapi"
-HEIMDAL_GSSAPI_CFLAGS=""
-HEIMDAL_GSSAPI_CPPFLAGS=""
-HEIMDAL_GSSAPI_LDFLAGS=""
-SMB_EXT_LIB(HEIMDAL_GSSAPI,
-	    [${HEIMDAL_GSSAPI_LIBS}],
-	    [${HEIMDAL_GSSAPI_CFLAGS}],
-	    [${HEIMDAL_GSSAPI_CPPFLAGS}],
-	    [${HEIMDAL_GSSAPI_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_GSSAPI,YES)
-AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])
-HAVE_GSSAPI=YES
-
-HEIMDAL_HDB_LIBS="-lhdb"
-HEIMDAL_HDB_CFLAGS=""
-HEIMDAL_HDB_CPPFLAGS=""
-HEIMDAL_HDB_LDFLAGS=""
-SMB_EXT_LIB(HEIMDAL_HDB,
-	    [${HEIMDAL_HDB_LIBS}],
-	    [${HEIMDAL_HDB_CFLAGS}],
-	    [${HEIMDAL_HDB_CPPFLAGS}],
-	    [${HEIMDAL_HDB_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_HDB,YES)
-
-HEIMDAL_KDC_LIBS="-lkdc"
-HEIMDAL_KDC_CFLAGS=""
-HEIMDAL_KDC_CPPFLAGS=""
-HEIMDAL_KDC_LDFLAGS=""
-SMB_EXT_LIB(HEIMDAL_KDC,
-	    [${HEIMDAL_KDC_LIBS}],
-	    [${HEIMDAL_KDC_CFLAGS}],
-	    [${HEIMDAL_KDC_CPPFLAGS}],
-	    [${HEIMDAL_KDC_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_KDC,YES)
diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
deleted file mode 100644
index 433394f1af..0000000000
--- a/source4/heimdal_build/internal.m4
+++ /dev/null
@@ -1,308 +0,0 @@
-m4_define([upcase],`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl
-
-m4_ifndef([AC_WARNING_ENABLE],[AC_DEFUN([AC_WARNING_ENABLE],[])])
-
-dnl love_FIND_FUNC(func, includes, arguments)
-dnl kind of like AC_CHECK_FUNC, but with headerfiles
-AC_DEFUN([love_FIND_FUNC], [
-
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_love_func_$1,
-[
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[$1($3)]])],
-[eval "ac_cv_love_func_$1=yes"],[eval "ac_cv_love_func_$1=no"])])
-
-eval "ac_res=\$ac_cv_love_func_$1"
-
-if false; then
-	AC_CHECK_FUNCS($1)
-fi
-# $1
-eval "ac_tr_func=HAVE_[]upcase($1)"
-
-case "$ac_res" in
-	yes)
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_MSG_RESULT([yes])
-	;;
-	no)
-	AC_MSG_RESULT([no])
-	;;
-esac
-
-
-])
-
-AC_CHECK_TYPE(u_char, uint8_t)
-AC_CHECK_TYPE(u_int32_t, uint32_t)
-
-dnl Not all systems have err.h, so we provide a replacement. Heimdal
-dnl unconditionally #includes <err.h>, so we need to create an err.h,
-dnl but we can't just have a static one because we don't want to use
-dnl it on systems that have a real err.h. If the system has a real
-dnl err.h, we should use that (eg. on Darwin, the declarations get
-dnl linker attributes added, so we can't guarantee that our local
-dnl declarations will be correct). Phew!
-AC_CHECK_HEADERS([err.h], [],
-	[ cp heimdal/lib/roken/err.hin heimdal_build/err.h ])
-
-dnl Not all systems have ifaddrs.h, so we provide a replacement. Heimdal
-dnl unconditionally #includes <ifaddrs.h>, so we need to create an ifaddrs.h,
-dnl but we can't just have a static one because we don't want to use
-dnl it on systems that have a real ifaddrs.h. If the system has a real
-dnl ifaddrs.h. We don't use heimdal's lib/roken/ifaddrs.hin because
-dnl our libreplace would conflict with it.
-AC_CHECK_HEADERS([ifaddrs.h], [],
-	[ cp heimdal_build/ifaddrs.hin heimdal_build/ifaddrs.h ])
-
-AC_CHECK_HEADERS([				\
-	crypt.h					\
-	curses.h				\
-	errno.h					\
-	inttypes.h				\
-	netdb.h					\
-	signal.h				\
-	sys/bswap.h				\
-	sys/file.h				\
-	sys/stropts.h				\
-	sys/timeb.h				\
-	sys/times.h				\
-	sys/uio.h				\
-	sys/un.h				\
-	sys/utsname.h				\
-	term.h					\
-	termcap.h				\
-	time.h					\
-	timezone.h				\
-	ttyname.h				\
-	netinet/in.h				\
-	netinet/in6.h				\
-	netinet6/in6.h				\
-	libintl.h
-])
-
-AC_CHECK_FUNCS([				\
-	atexit					\
-	cgetent					\
-	getprogname				\
-	setprogname				\
-	inet_aton				\
-	gethostname				\
-	getnameinfo				\
-	iruserok				\
-	putenv					\
-	rcmd					\
-	readv					\
-	sendmsg					\
-	setitimer				\
-	socket					\
-	strlwr					\
-	strncasecmp				\
-	strptime				\
-	strsep					\
-	strsep_copy				\
-	strtok_r				\
-	strupr					\
-	swab					\
-	umask					\
-	uname					\
-	unsetenv				\
-	closefrom				\
-	hstrerror				\
-	err					\
-	warn					\
-	errx					\
-	warnx					\
-	flock					\
-	getipnodebyname				\
-	getipnodebyaddr				\
-	freehostent				\
-	writev
-])
-
-love_FIND_FUNC(bswap16, [#ifdef HAVE_SYS_BSWAP_H
-#include <sys/bswap.h>
-#endif], 0)
-
-love_FIND_FUNC(bswap32, [#ifdef HAVE_SYS_BSWAP_H
-#include <sys/bswap.h>
-#endif], 0)
-
-AC_DEFUN([AC_KRB_STRUCT_WINSIZE], [
-AC_MSG_CHECKING(for struct winsize)
-AC_CACHE_VAL(ac_cv_struct_winsize, [
-ac_cv_struct_winsize=no
-for i in sys/termios.h sys/ioctl.h; do
-AC_EGREP_HEADER(
-struct[[ 	]]*winsize,dnl
-$i, ac_cv_struct_winsize=yes; break)dnl
-done
-])
-if test "$ac_cv_struct_winsize" = "yes"; then
-  AC_DEFINE(HAVE_STRUCT_WINSIZE, 1, [define if struct winsize is declared in sys/termios.h])
-fi
-AC_MSG_RESULT($ac_cv_struct_winsize)
-AC_EGREP_HEADER(ws_xpixel, termios.h, 
-	AC_DEFINE(HAVE_WS_XPIXEL, 1, [define if struct winsize has ws_xpixel]))
-AC_EGREP_HEADER(ws_ypixel, termios.h, 
-	AC_DEFINE(HAVE_WS_YPIXEL, 1, [define if struct winsize has ws_ypixel]))
-])
-
-AC_KRB_STRUCT_WINSIZE
-
-AC_TYPE_SIGNAL
-if test "$ac_cv_type_signal" = "void" ; then
-	AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.])
-fi
-AC_SUBST(VOID_RETSIGTYPE)
-
-
-m4_include(heimdal/cf/check-var.m4)
-
-rk_CHECK_VAR(h_errno, 
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif])
-
-m4_include(heimdal/cf/find-func.m4)
-m4_include(heimdal/cf/find-func-no-libs.m4)
-m4_include(heimdal/cf/find-func-no-libs2.m4)
-m4_include(heimdal/cf/resolv.m4)
-
-AC_CHECK_HEADERS([pty.h util.h libutil.h])
-
-AC_CHECK_LIB_EXT(util, OPENPTY_LIBS, openpty)
-
-SMB_ENABLE(OPENPTY,YES)
-
-SMB_EXT_LIB(OPENPTY,[${OPENPTY_LIBS}],[${OPENPTY_CFLAGS}],[${OPENPTY_CPPFLAGS}],[${OPENPTY_LDFLAGS}])
-
-AC_CHECK_LIB_EXT(intl, INTL_LIBS, gettext)
-
-SMB_ENABLE(INTL,YES)
-
-SMB_EXT_LIB(INTL, $INTL_LIBS)
-
-smb_save_LIBS=$LIBS
-RESOLV_LIBS=""
-LIBS=""
-
-dnl  This fills in the global LIBS...
-rk_RESOLV
-
-dnl AC_CHECK_LIB_EXT(resolv, RESOLV_LIBS, res_search)
-	SMB_ENABLE(RESOLV,YES)
-
-if test x"$LIBS" != "x"; then
-	RESOLV_LIBS=$LIBS
-fi
-
-LIBS=$smb_save_LIBS
-
-SMB_EXT_LIB(RESOLV,[${RESOLV_LIBS}],[${RESOLV_CFLAGS}],[${RESOLV_CPPFLAGS}],[${RESOLV_LDFLAGS}])
-
-
-# these are disabled unless heimdal is found below
-SMB_ENABLE(KERBEROS_LIB, NO)
-SMB_ENABLE(asn1_compile, NO)
-SMB_ENABLE(compile_et, NO)
-
-#
-# We need bison -y and flex in new versions
-# Otherwise we get random runtime failures
-#
-LEX_YACC_COMBINATIONS=""
-LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3"
-LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.34:bison-2.3"
-LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.3"
-LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.4.1"
-
-AC_PROG_LEX
-LEX_BASENAME=`basename "$LEX"`
-if test x"$LEX_BASENAME" = x"flex"; then
-	# "flex 2.5.33"
-	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
-	AC_MSG_CHECKING(flex version)
-	AC_MSG_RESULT($FLEX_VERSION)
-	FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
-	FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-	FLEX_RELEASE=`echo $FLEX_VERSION | cut -d '.' -f3`
-
-	LEX_VERSION="flex-$FLEX_MAJOR.$FLEX_MINOR.$FLEX_RELEASE"
-fi
-
-AC_PROG_YACC
-YACC_BASENAME=`basename "$YACC"`
-if test x"$YACC_BASENAME" = x"bison -y"; then
-	# bison (GNU Bison) 2.3
-	# or
-	# bison (GNU Bison) 2.4.1
-	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
-	AC_MSG_CHECKING(bison version)
-	AC_MSG_RESULT($BISON_VERSION)
-	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
-	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-	BISON_RELEASE=`echo $BISON_VERSION | cut -d '.' -f3`
-
-	if test x"$BISON_RELEASE" != x""; then
-		YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR.$BISON_RELEASE"
-	else
-		YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
-	fi
-fi
-
-AC_MSG_CHECKING(working LEX YACC combination)
-LEX_YACC="no"
-if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-	V="$LEX_VERSION:$YACC_VERSION"
-	for C in $LEX_YACC_COMBINATIONS; do
-		if test x"$V" = x"$C"; then
-			LEX_YACC=$V
-			break;
-		fi
-	done
-fi
-if test x"$LEX_YACC" = x"no"; then
-	LEX=false
-	YACC=false
-fi
-AC_MSG_RESULT($LEX_YACC)
-
-# Portions of heimdal kerberos are unpacked into source/heimdal
-# of the samba source tree.  
-
-# if we ever get to using a host kerberos, we might add conditionals here
-AC_DEFINE(HAVE_COM_ERR,1,[Whether com_err is available])
-HAVE_COM_ERR=YES
-AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
-HAVE_KRB5=YES
-AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])
-HAVE_GSSAPI=YES
-SMB_ENABLE(KERBEROS_LIB, YES)
-SMB_ENABLE(asn1_compile, YES)
-SMB_ENABLE(compile_et, YES)
-
-# only add closefrom if needed
-SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO)
-SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM_H, NO)
-if test t$ac_cv_func_closefrom != tyes; then
-	SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, YES)
-	SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM_H, YES)
-fi
-
-# only add getprogname if needed
-SMB_ENABLE(HEIMDAL_ROKEN_PROGNAME, NO)
-SMB_ENABLE(HEIMDAL_ROKEN_PROGNAME_H, NO)
-if test t$ac_cv_func_getprogname != tyes; then
-	SMB_ENABLE(HEIMDAL_ROKEN_PROGNAME, YES)
-	SMB_ENABLE(HEIMDAL_ROKEN_PROGNAME_H, YES)
-fi
-
-VPATH="$VPATH:\$(HEIMDAL_VPATH)"
-
-AC_DEFINE(SAMBA4_INTERNAL_HEIMDAL,1,[Whether we use in internal heimdal build])
-
-SMB_INCLUDE_MK(heimdal_build/internal.mk)
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
deleted file mode 100644
index 2f8487edee..0000000000
--- a/source4/heimdal_build/internal.mk
+++ /dev/null
@@ -1,812 +0,0 @@
-heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build
-
-HEIMDAL_VPATH = $(heimdalbuildsrcdir):$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
-
-# Create a prototype header
-# Arguments: header file, arguments, c files, deps
-define heimdal_proto_header_template
-
-proto:: $(1)
-
-clean:: ;
-	rm -f $(1)
-
-$(4):: $(1)
-
-$(1): $(3) ;
-	@echo "Creating $$@"
-	@$$(PERL) $$(heimdalsrcdir)/cf/make-proto.pl $(2) $(1) $(3)
-
-endef
-
-#######################
-# Start SUBSYSTEM HEIMDAL_KDC
-[SUBSYSTEM::HEIMDAL_KDC]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 \
-		HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 HEIMDAL_NTLM HEIMDAL_HCRYPTO
-# End SUBSYSTEM HEIMDAL_KDC
-#######################
-
-
-HEIMDAL_KDC_OBJ_FILES = \
-	$(heimdalsrcdir)/kdc/default_config.o \
-	$(heimdalsrcdir)/kdc/kerberos5.o \
-	$(heimdalsrcdir)/kdc/krb5tgs.o \
-	$(heimdalsrcdir)/kdc/pkinit.o \
-	$(heimdalsrcdir)/kdc/log.o \
-	$(heimdalsrcdir)/kdc/misc.o \
-	$(heimdalsrcdir)/kdc/kaserver.o \
-	$(heimdalsrcdir)/kdc/digest.o \
-	$(heimdalsrcdir)/kdc/process.o \
-	$(heimdalsrcdir)/kdc/windc.o \
-	$(heimdalsrcdir)/kdc/kx509.o
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/kdc/kdc-protos.h, \
-  -q -P comment -o, \
-  $(HEIMDAL_KDC_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_KDC_OBJ_FILES) $(HEIMDAL_KDC_OBJ_FILES:.o=.d) \
-))
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/kdc/kdc-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_KDC_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_KDC_OBJ_FILES) $(HEIMDAL_KDC_OBJ_FILES:.o=.d) \
-))
-
-[SUBSYSTEM::HEIMDAL_NTLM]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5
-
-HEIMDAL_NTLM_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/ntlm/ntlm.o
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/ntlm/heimntlm-protos.h, \
-  -q -P comment -o, \
-  $(HEIMDAL_NTLM_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_NTLM_OBJ_FILES) $(HEIMDAL_NTLM_OBJ_FILES:.o=.d) \
-))
-
-[SUBSYSTEM::HEIMDAL_HDB_KEYS]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \
-					   HEIMDAL_HDB_ASN1
-
-HEIMDAL_HDB_KEYS_OBJ_FILES = $(heimdalsrcdir)/lib/hdb/keys.o
-
-#######################
-# Start SUBSYSTEM HEIMDAL_HDB
-[SUBSYSTEM::HEIMDAL_HDB]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb
-PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1
-# End SUBSYSTEM HEIMDAL_HDB
-#######################
-
-HEIMDAL_HDB_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/hdb/db.o \
-	$(heimdalsrcdir)/lib/hdb/dbinfo.o \
-	$(heimdalsrcdir)/lib/hdb/hdb.o \
-	$(heimdalsrcdir)/lib/hdb/ext.o \
-	$(heimdalsrcdir)/lib/hdb/keytab.o \
-	$(heimdalsrcdir)/lib/hdb/hdb-keytab.o \
-	$(heimdalsrcdir)/lib/hdb/mkey.o \
-	$(heimdalsrcdir)/lib/hdb/ndbm.o \
-	$(heimdalsrcdir)/lib/hdb/hdb_err.o \
-	$(heimdalbuildsrcdir)/hdb-glue.o
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/hdb/hdb-protos.h, \
-  -q -P comment -o, \
-  $(HEIMDAL_HDB_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_HDB_OBJ_FILES) $(HEIMDAL_HDB_OBJ_FILES:.o=.d) \
-))
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/hdb/hdb-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_HDB_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_HDB_OBJ_FILES) $(HEIMDAL_HDB_OBJ_FILES:.o=.d) \
-))
-
-basics:: $(heimdalsrcdir)/lib/hdb/hdb-protos.h $(heimdalsrcdir)/lib/hdb/hdb-private.h
-
-#######################
-# Start SUBSYSTEM HEIMDAL_GSSAPI
-[SUBSYSTEM::HEIMDAL_GSSAPI]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech
-PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 HEIMDAL_ROKEN HEIMDAL_KRB5
-# End SUBSYSTEM HEIMDAL_GSSAPI
-#######################
-
-HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/spnego/external.o \
-	$(heimdalsrcdir)/lib/gssapi/spnego/compat.o \
-	$(heimdalsrcdir)/lib/gssapi/spnego/context_stubs.o \
-	$(heimdalsrcdir)/lib/gssapi/spnego/cred_stubs.o \
-	$(heimdalsrcdir)/lib/gssapi/spnego/accept_sec_context.o \
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/gssapi/spnego/spnego-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES) $(HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES:.o=.d) \
-))
-
-HEIMDAL_GSSAPI_KRB5_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/gssapi/krb5/copy_ccache.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/delete_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/init_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/context_time.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/init.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/address_to_krb5addr.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/get_mic.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/add_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_mech.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_mechs_for_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_names_for_mech.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/indicate_mechs.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/inquire_sec_context_by_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/export_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/import_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/duplicate_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/import_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/compare_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/export_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/canonicalize_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/unwrap.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/wrap.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/release_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/cfx.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/8003.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/arcfour.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/encapsulate.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/display_name.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/sequence.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/display_status.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/external.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/compat.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/creds.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/store_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/prf.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/aeap.o
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/gssapi/krb5/gsskrb5-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_GSSAPI_KRB5_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_GSSAPI_KRB5_OBJ_FILES) $(HEIMDAL_GSSAPI_KRB5_OBJ_FILES:.o=.d) \
-))
-
-HEIMDAL_GSSAPI_OBJ_FILES = \
-	$(HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES) \
-	$(HEIMDAL_GSSAPI_KRB5_OBJ_FILES) \
-	$(heimdalsrcdir)/lib/gssapi/mech/context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_krb5.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_mech_switch.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_process_context_token.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_buffer_set.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_aeap.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_add_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_add_oid_set_member.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_compare_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid_set.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_create_empty_oid_set.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_decapsulate_token.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_canonicalize_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_sec_context_by_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_names_for_mech.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_mechs_for_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_wrap_size_limit.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_names.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_verify.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_display_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_display_status.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_buffer.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_test_oid_set_member.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_set_sec_context_option.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_export_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_seal.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_acquire_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_unseal.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_verify_mic.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_accept_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_mech.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_indicate_mechs.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_delete_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_sign.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_utils.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_init_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_oid_equal.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_oid_to_str.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_context_time.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_encapsulate_token.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_get_mic.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_import_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_wrap.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_import_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_unwrap.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_export_sec_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_context.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_name.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_set_cred_option.o \
-	$(heimdalsrcdir)/lib/gssapi/mech/gss_pseudo_random.o \
-	$(heimdalbuildsrcdir)/gssapi-glue.o
-
-#######################
-# Start SUBSYSTEM HEIMDAL_KRB5
-[SUBSYSTEM::HEIMDAL_KRB5]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND \
-		HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO \
-		LIBNETIF LIBSAMBA-HOSTCONFIG INTL
-PUBLIC_DEPENDENCIES = HEIMDAL_COM_ERR
-# End SUBSYSTEM HEIMDAL_KRB5
-#######################
-
-HEIMDAL_KRB5_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/krb5/acache.o \
-	$(heimdalsrcdir)/lib/krb5/add_et_list.o \
-	$(heimdalsrcdir)/lib/krb5/addr_families.o \
-	$(heimdalsrcdir)/lib/krb5/appdefault.o \
-	$(heimdalsrcdir)/lib/krb5/asn1_glue.o \
-	$(heimdalsrcdir)/lib/krb5/auth_context.o \
-	$(heimdalsrcdir)/lib/krb5/build_ap_req.o \
-	$(heimdalsrcdir)/lib/krb5/build_auth.o \
-	$(heimdalsrcdir)/lib/krb5/cache.o \
-	$(heimdalsrcdir)/lib/krb5/changepw.o \
-	$(heimdalsrcdir)/lib/krb5/codec.o \
-	$(heimdalsrcdir)/lib/krb5/config_file.o \
-	$(heimdalsrcdir)/lib/krb5/constants.o \
-	$(heimdalsrcdir)/lib/krb5/context.o \
-	$(heimdalsrcdir)/lib/krb5/convert_creds.o \
-	$(heimdalsrcdir)/lib/krb5/copy_host_realm.o \
-	$(heimdalsrcdir)/lib/krb5/crc.o \
-	$(heimdalsrcdir)/lib/krb5/creds.o \
-	$(heimdalsrcdir)/lib/krb5/crypto.o \
-	$(heimdalsrcdir)/lib/krb5/data.o \
-	$(heimdalsrcdir)/lib/krb5/eai_to_heim_errno.o \
-	$(heimdalsrcdir)/lib/krb5/error_string.o \
-	$(heimdalsrcdir)/lib/krb5/expand_hostname.o \
-	$(heimdalsrcdir)/lib/krb5/fcache.o \
-	$(heimdalsrcdir)/lib/krb5/free.o \
-	$(heimdalsrcdir)/lib/krb5/free_host_realm.o \
-	$(heimdalsrcdir)/lib/krb5/generate_seq_number.o \
-	$(heimdalsrcdir)/lib/krb5/generate_subkey.o \
-	$(heimdalsrcdir)/lib/krb5/get_addrs.o \
-	$(heimdalsrcdir)/lib/krb5/get_cred.o \
-	$(heimdalsrcdir)/lib/krb5/get_default_principal.o \
-	$(heimdalsrcdir)/lib/krb5/get_default_realm.o \
-	$(heimdalsrcdir)/lib/krb5/get_for_creds.o \
-	$(heimdalsrcdir)/lib/krb5/get_host_realm.o \
-	$(heimdalsrcdir)/lib/krb5/get_in_tkt.o \
-	$(heimdalsrcdir)/lib/krb5/get_port.o \
-	$(heimdalsrcdir)/lib/krb5/init_creds.o \
-	$(heimdalsrcdir)/lib/krb5/init_creds_pw.o \
-	$(heimdalsrcdir)/lib/krb5/kcm.o \
-	$(heimdalsrcdir)/lib/krb5/keyblock.o \
-	$(heimdalsrcdir)/lib/krb5/keytab.o \
-	$(heimdalsrcdir)/lib/krb5/keytab_any.o \
-	$(heimdalsrcdir)/lib/krb5/keytab_file.o \
-	$(heimdalsrcdir)/lib/krb5/keytab_memory.o \
-	$(heimdalsrcdir)/lib/krb5/keytab_keyfile.o \
-	$(heimdalsrcdir)/lib/krb5/krbhst.o \
-	$(heimdalsrcdir)/lib/krb5/log.o \
-	$(heimdalsrcdir)/lib/krb5/mcache.o \
-	$(heimdalsrcdir)/lib/krb5/misc.o \
-	$(heimdalsrcdir)/lib/krb5/mk_error.o \
-	$(heimdalsrcdir)/lib/krb5/mk_priv.o \
-	$(heimdalsrcdir)/lib/krb5/mk_rep.o \
-	$(heimdalsrcdir)/lib/krb5/mk_req.o \
-	$(heimdalsrcdir)/lib/krb5/mk_req_ext.o \
-	$(heimdalsrcdir)/lib/krb5/mit_glue.o \
-	$(heimdalsrcdir)/lib/krb5/n-fold.o \
-	$(heimdalsrcdir)/lib/krb5/padata.o \
-	$(heimdalsrcdir)/lib/krb5/pkinit.o \
-	$(heimdalsrcdir)/lib/krb5/plugin.o \
-	$(heimdalsrcdir)/lib/krb5/principal.o \
-	$(heimdalsrcdir)/lib/krb5/prog_setup.o \
-	$(heimdalsrcdir)/lib/krb5/pac.o \
-	$(heimdalsrcdir)/lib/krb5/prompter_posix.o \
-	$(heimdalsrcdir)/lib/krb5/rd_cred.o \
-	$(heimdalsrcdir)/lib/krb5/rd_error.o \
-	$(heimdalsrcdir)/lib/krb5/rd_priv.o \
-	$(heimdalsrcdir)/lib/krb5/rd_rep.o \
-	$(heimdalsrcdir)/lib/krb5/rd_req.o \
-	$(heimdalsrcdir)/lib/krb5/replay.o \
-	$(heimdalsrcdir)/lib/krb5/send_to_kdc.o \
-	$(heimdalsrcdir)/lib/krb5/set_default_realm.o \
-	$(heimdalsrcdir)/lib/krb5/store.o \
-	$(heimdalsrcdir)/lib/krb5/store_emem.o \
-	$(heimdalsrcdir)/lib/krb5/store_fd.o \
-	$(heimdalsrcdir)/lib/krb5/store_mem.o \
-	$(heimdalsrcdir)/lib/krb5/ticket.o \
-	$(heimdalsrcdir)/lib/krb5/time.o \
-	$(heimdalsrcdir)/lib/krb5/transited.o \
-	$(heimdalsrcdir)/lib/krb5/v4_glue.o \
-	$(heimdalsrcdir)/lib/krb5/version.o \
-	$(heimdalsrcdir)/lib/krb5/warn.o \
-	$(heimdalsrcdir)/lib/krb5/krb5_err.o \
-	$(heimdalsrcdir)/lib/krb5/heim_err.o \
-	$(heimdalsrcdir)/lib/krb5/k524_err.o \
-	$(heimdalsrcdir)/lib/krb5/krb_err.o \
-	$(heimdalbuildsrcdir)/krb5-glue.o
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/krb5/krb5-protos.h, \
-  -E KRB5_LIB -q -P comment -o, \
-  $(HEIMDAL_KRB5_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_KRB5_OBJ_FILES) $(HEIMDAL_KRB5_OBJ_FILES:.o=.d) \
-))
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/krb5/krb5-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_KRB5_OBJ_FILES:.o=.c), \
-  $(HEIMDAL_KRB5_OBJ_FILES) $(HEIMDAL_KRB5_OBJ_FILES:.o=.d) \
-))
-
-#######################
-# Start SUBSYSTEM HEIMDAL_HEIM_ASN1
-[SUBSYSTEM::HEIMDAL_HEIM_ASN1]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
-# End SUBSYSTEM HEIMDAL_KRB5
-#######################
-
-HEIMDAL_HEIM_ASN1_DER_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/asn1/der_get.o \
-	$(heimdalsrcdir)/lib/asn1/der_put.o \
-	$(heimdalsrcdir)/lib/asn1/der_free.o \
-	$(heimdalsrcdir)/lib/asn1/der_format.o \
-	$(heimdalsrcdir)/lib/asn1/der_length.o \
-	$(heimdalsrcdir)/lib/asn1/der_copy.o \
-	$(heimdalsrcdir)/lib/asn1/der_cmp.o \
-
-HEIMDAL_HEIM_ASN1_OBJ_FILES = \
-	$(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES) \
-	$(heimdalsrcdir)/lib/asn1/extra.o \
-	$(heimdalsrcdir)/lib/asn1/timegm.o \
-	$(heimdalsrcdir)/lib/asn1/asn1_err.o
-
-#######################
-# Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
-[SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto/imath 
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN 
-# End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
-#######################
-
-HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/hcrypto/imath/imath.o \
-	$(heimdalsrcdir)/lib/hcrypto/imath/iprime.o
-
-[SUBSYSTEM::HEIMDAL_HCRYPTO]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1
-# End SUBSYSTEM HEIMDAL_HCRYPTO
-#######################
-
-HEIMDAL_HCRYPTO_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/hcrypto/aes.o \
-	$(heimdalsrcdir)/lib/hcrypto/bn.o \
-	$(heimdalsrcdir)/lib/hcrypto/dh.o \
-	$(heimdalsrcdir)/lib/hcrypto/dh-imath.o \
-	$(heimdalsrcdir)/lib/hcrypto/des.o \
-	$(heimdalsrcdir)/lib/hcrypto/dsa.o \
-	$(heimdalsrcdir)/lib/hcrypto/engine.o \
-	$(heimdalsrcdir)/lib/hcrypto/md2.o \
-	$(heimdalsrcdir)/lib/hcrypto/md4.o \
-	$(heimdalsrcdir)/lib/hcrypto/md5.o \
-	$(heimdalsrcdir)/lib/hcrypto/rsa.o \
-	$(heimdalsrcdir)/lib/hcrypto/rsa-imath.o \
-	$(heimdalsrcdir)/lib/hcrypto/rc2.o \
-	$(heimdalsrcdir)/lib/hcrypto/rc4.o \
-	$(heimdalsrcdir)/lib/hcrypto/rijndael-alg-fst.o \
-	$(heimdalsrcdir)/lib/hcrypto/rnd_keys.o \
-	$(heimdalsrcdir)/lib/hcrypto/sha.o \
-	$(heimdalsrcdir)/lib/hcrypto/sha256.o \
-	$(heimdalsrcdir)/lib/hcrypto/ui.o \
-	$(heimdalsrcdir)/lib/hcrypto/evp.o \
-	$(heimdalsrcdir)/lib/hcrypto/evp-hcrypto.o \
-	$(heimdalsrcdir)/lib/hcrypto/pkcs5.o \
-	$(heimdalsrcdir)/lib/hcrypto/pkcs12.o \
-	$(heimdalsrcdir)/lib/hcrypto/rand.o \
-	$(heimdalsrcdir)/lib/hcrypto/rand-egd.o \
-	$(heimdalsrcdir)/lib/hcrypto/rand-unix.o \
-	$(heimdalsrcdir)/lib/hcrypto/rand-fortuna.o \
-	$(heimdalsrcdir)/lib/hcrypto/rand-timer.o \
-	$(heimdalsrcdir)/lib/hcrypto/hmac.o \
-	$(heimdalsrcdir)/lib/hcrypto/camellia.o \
-	$(heimdalsrcdir)/lib/hcrypto/camellia-ntt.o
-
-#######################
-# Start SUBSYSTEM HEIMDAL_HX509
-[SUBSYSTEM::HEIMDAL_HX509]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 
-PRIVATE_DEPENDENCIES = \
-	HEIMDAL_ROKEN HEIMDAL_COM_ERR \
-	HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO \
-	HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
-	HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
-	HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \
-	HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \
-	HEIMDAL_WIND
-# End SUBSYSTEM HEIMDAL_HX509
-#######################
-
-HEIMDAL_HX509_OBJH_FILES = \
-	$(heimdalsrcdir)/lib/hx509/ca.o \
-	$(heimdalsrcdir)/lib/hx509/cert.o \
-	$(heimdalsrcdir)/lib/hx509/cms.o \
-	$(heimdalsrcdir)/lib/hx509/collector.o \
-	$(heimdalsrcdir)/lib/hx509/crypto.o \
-	$(heimdalsrcdir)/lib/hx509/error.o \
-	$(heimdalsrcdir)/lib/hx509/env.o \
-	$(heimdalsrcdir)/lib/hx509/file.o \
-	$(heimdalsrcdir)/lib/hx509/keyset.o \
-	$(heimdalsrcdir)/lib/hx509/ks_dir.o \
-	$(heimdalsrcdir)/lib/hx509/ks_file.o \
-	$(heimdalsrcdir)/lib/hx509/ks_keychain.o \
-	$(heimdalsrcdir)/lib/hx509/ks_mem.o \
-	$(heimdalsrcdir)/lib/hx509/ks_null.o \
-	$(heimdalsrcdir)/lib/hx509/ks_p11.o \
-	$(heimdalsrcdir)/lib/hx509/ks_p12.o \
-	$(heimdalsrcdir)/lib/hx509/lock.o \
-	$(heimdalsrcdir)/lib/hx509/name.o \
-	$(heimdalsrcdir)/lib/hx509/peer.o \
-	$(heimdalsrcdir)/lib/hx509/print.o \
-	$(heimdalsrcdir)/lib/hx509/req.o \
-	$(heimdalsrcdir)/lib/hx509/revoke.o \
-	$(heimdalsrcdir)/lib/hx509/sel.o \
-	$(heimdalsrcdir)/lib/hx509/hx509_err.o
-
-HEIMDAL_HX509_OBJG_FILES = \
-	$(heimdalsrcdir)/lib/hx509/sel-lex.o \
-	$(heimdalsrcdir)/lib/hx509/sel-gram.o
-
-$(heimdalsrcdir)/lib/hx509/sel-lex.c:: $(heimdalsrcdir)/lib/hx509/sel-gram.c
-dist:: $(heimdalsrcdir)/lib/hx509/sel-lex.c
-
-HEIMDAL_HX509_OBJ_FILES = $(HEIMDAL_HX509_OBJH_FILES) $(HEIMDAL_HX509_OBJG_FILES)
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/hx509/hx509-protos.h, \
-  -R '^(_|^C)' -E HX509_LIB -q -P comment -o, \
-  $(HEIMDAL_HX509_OBJH_FILES:.o=.c), \
-  $(HEIMDAL_HX509_OBJH_FILES) $(HEIMDAL_HX509_OBJH_FILES:.o=.d) \
-))
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/hx509/hx509-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_HX509_OBJH_FILES:.o=.c), \
-  $(HEIMDAL_HX509_OBJH_FILES) $(HEIMDAL_HX509_OBJH_FILES:.o=.d) \
-))
-
-#######################
-# Start SUBSYSTEM HEIMDAL_WIND
-[SUBSYSTEM::HEIMDAL_WIND]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind 
-PRIVATE_DEPENDENCIES = \
-	HEIMDAL_ROKEN HEIMDAL_COM_ERR
-
-HEIMDAL_WIND_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/wind/wind_err.o \
-	$(heimdalsrcdir)/lib/wind/stringprep.o \
-	$(heimdalsrcdir)/lib/wind/errorlist.o \
-	$(heimdalsrcdir)/lib/wind/errorlist_table.o \
-	$(heimdalsrcdir)/lib/wind/normalize.o \
-	$(heimdalsrcdir)/lib/wind/normalize_table.o \
-	$(heimdalsrcdir)/lib/wind/combining.o \
-	$(heimdalsrcdir)/lib/wind/combining_table.o \
-	$(heimdalsrcdir)/lib/wind/utf8.o \
-	$(heimdalsrcdir)/lib/wind/bidi.o \
-	$(heimdalsrcdir)/lib/wind/bidi_table.o \
-	$(heimdalsrcdir)/lib/wind/ldap.o \
-	$(heimdalsrcdir)/lib/wind/map.o \
-	$(heimdalsrcdir)/lib/wind/map_table.o
-# End SUBSYSTEM HEIMDAL_WIND
-#######################
-
-$(HEIMDAL_WIND_OBJ_FILES) $(HEIMDAL_WIND_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/wind/map_table.h
-
-$(heimdalsrcdir)/lib/wind/map_table.h $(heimdalsrcdir)/lib/wind/map_table.c: $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/gen-map.py $(heimdalsrcdir)/lib/wind/stringprep.py
-	$(PYTHON) $(heimdalsrcdir)/lib/wind/gen-map.py $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/wind/map_table.h $(heimdalsrcdir)/lib/wind/map_table.c
-
-$(HEIMDAL_WIND_OBJ_FILES) $(HEIMDAL_WIND_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/wind/errorlist_table.h
-
-$(heimdalsrcdir)/lib/wind/errorlist_table.h $(heimdalsrcdir)/lib/wind/errorlist_table.c: $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/gen-errorlist.py $(heimdalsrcdir)/lib/wind/stringprep.py
-	$(PYTHON) $(heimdalsrcdir)/lib/wind/gen-errorlist.py $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/wind/errorlist_table.h $(heimdalsrcdir)/lib/wind/errorlist_table.c
-
-$(HEIMDAL_WIND_OBJ_FILES) $(HEIMDAL_WIND_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/wind/normalize_table.h
-
-$(heimdalsrcdir)/lib/wind/normalize_table.h $(heimdalsrcdir)/lib/wind/normalize_table.c: $(heimdalsrcdir)/lib/wind/UnicodeData.txt $(heimdalsrcdir)/lib/wind/CompositionExclusions-3.2.0.txt $(heimdalsrcdir)/lib/wind/gen-normalize.py
-	$(PYTHON) $(heimdalsrcdir)/lib/wind/gen-normalize.py $(heimdalsrcdir)/lib/wind/UnicodeData.txt $(heimdalsrcdir)/lib/wind/CompositionExclusions-3.2.0.txt $(heimdalsrcdir)/lib/wind/
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/wind/normalize_table.h $(heimdalsrcdir)/lib/wind/normalize_table.c
-
-$(HEIMDAL_WIND_OBJ_FILES) $(HEIMDAL_WIND_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/wind/combining_table.h
-
-$(heimdalsrcdir)/lib/wind/combining_table.h $(heimdalsrcdir)/lib/wind/combining_table.c: $(heimdalsrcdir)/lib/wind/UnicodeData.txt $(heimdalsrcdir)/lib/wind/gen-combining.py
-	$(PYTHON) $(heimdalsrcdir)/lib/wind/gen-combining.py $(heimdalsrcdir)/lib/wind/UnicodeData.txt $(heimdalsrcdir)/lib/wind/
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/wind/combining_table.h $(heimdalsrcdir)/lib/wind/combining_table.c
-
-$(HEIMDAL_WIND_OBJ_FILES) $(HEIMDAL_WIND_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/wind/bidi_table.h
-
-$(heimdalsrcdir)/lib/wind/bidi_table.h $(heimdalsrcdir)/lib/wind/bidi_table.c: $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/gen-bidi.py
-	$(PYTHON) $(heimdalsrcdir)/lib/wind/gen-bidi.py $(heimdalsrcdir)/lib/wind/rfc3454.txt $(heimdalsrcdir)/lib/wind/
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/wind/bidi_table.h $(heimdalsrcdir)/lib/wind/bidi_table.c
-
-[SUBSYSTEM::HEIMDAL_ROKEN_PROGNAME]
-
-HEIMDAL_ROKEN_PROGNAME_OBJ_FILES = \
-			$(heimdalsrcdir)/lib/roken/getprogname.o \
-			$(heimdalsrcdir)/lib/roken/setprogname.o
-$(HEIMDAL_ROKEN_PROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
-
-[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] 
-
-HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o
-$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
-
-[SUBSYSTEM::HEIMDAL_ROKEN_PROGNAME_H]
-
-HEIMDAL_ROKEN_PROGNAME_H_OBJ_FILES = \
-			$(heimdalsrcdir)/lib/roken/getprogname.ho \
-			$(heimdalsrcdir)/lib/roken/setprogname.ho
-$(HEIMDAL_ROKEN_PROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-
-[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM_H]
-
-HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.ho
-$(HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-
-#######################
-# Start SUBSYSTEM HEIMDAL_ROKEN
-[SUBSYSTEM::HEIMDAL_ROKEN]
-CFLAGS =  -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/include -I$(socketwrappersrcdir)
-PRIVATE_DEPENDENCIES = \
-			HEIMDAL_ROKEN_PROGNAME \
-			HEIMDAL_ROKEN_CLOSEFROM \
-			RESOLV \
-			LIBREPLACE_NETWORK \
-			UID_WRAPPER
-# End SUBSYSTEM HEIMDAL_ROKEN
-#######################
-
-HEIMDAL_ROKEN_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/roken/base64.o \
-	$(heimdalsrcdir)/lib/roken/ct.o \
-	$(heimdalsrcdir)/lib/roken/hex.o \
-	$(heimdalsrcdir)/lib/roken/bswap.o \
-	$(heimdalsrcdir)/lib/roken/dumpdata.o \
-	$(heimdalsrcdir)/lib/roken/emalloc.o \
-	$(heimdalsrcdir)/lib/roken/ecalloc.o \
-	$(heimdalsrcdir)/lib/roken/getarg.o \
-	$(heimdalsrcdir)/lib/roken/get_window_size.o \
-	$(heimdalsrcdir)/lib/roken/getdtablesize.o \
-	$(heimdalsrcdir)/lib/roken/h_errno.o \
-	$(heimdalsrcdir)/lib/roken/issuid.o \
-	$(heimdalsrcdir)/lib/roken/net_read.o \
-	$(heimdalsrcdir)/lib/roken/net_write.o \
-	$(heimdalsrcdir)/lib/roken/socket.o \
-	$(heimdalsrcdir)/lib/roken/parse_time.o \
-	$(heimdalsrcdir)/lib/roken/parse_units.o \
-	$(heimdalsrcdir)/lib/roken/resolve.o \
-	$(heimdalsrcdir)/lib/roken/roken_gethostby.o \
-	$(heimdalsrcdir)/lib/roken/signal.o \
-	$(heimdalsrcdir)/lib/roken/vis.o \
-	$(heimdalsrcdir)/lib/roken/strlwr.o \
-	$(heimdalsrcdir)/lib/roken/strsep_copy.o \
-	$(heimdalsrcdir)/lib/roken/strsep.o \
-	$(heimdalsrcdir)/lib/roken/strupr.o \
-	$(heimdalsrcdir)/lib/roken/strpool.o \
-	$(heimdalsrcdir)/lib/roken/estrdup.o \
-	$(heimdalsrcdir)/lib/roken/erealloc.o \
-	$(heimdalsrcdir)/lib/roken/simple_exec.o \
-	$(heimdalsrcdir)/lib/roken/strcollect.o \
-	$(heimdalsrcdir)/lib/roken/rtbl.o \
-	$(heimdalsrcdir)/lib/roken/cloexec.o \
-	$(heimdalsrcdir)/lib/roken/xfree.o \
-	$(heimdalbuildsrcdir)/replace.o
-
-$(HEIMDAL_ROKEN_OBJ_FILES) $(HEIMDAL_ROKEN_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/roken/roken.h
-
-[SUBSYSTEM::HEIMDAL_ROKEN_H]
-CFLAGS =  -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-PRIVATE_DEPENDENCIES = \
-			HEIMDAL_ROKEN_PROGNAME_H \
-			HEIMDAL_ROKEN_CLOSEFROM_H \
-			RESOLV \
-			LIBREPLACE_NETWORK
-
-HEIMDAL_ROKEN_H_OBJ_FILES = $(HEIMDAL_ROKEN_OBJ_FILES:.o=.ho)
-$(HEIMDAL_ROKEN_H_OBJ_FILES:.ho=.hd):: $(heimdalsrcdir)/lib/roken/roken.h
-
-$(heimdalsrcdir)/lib/roken/roken.h:
-	@echo 'Creating $(heimdalsrcdir)/lib/roken/roken.h'
-	@echo '#include "heimdal_build/roken.h"' > $(heimdalsrcdir)/lib/roken/roken.h
-
-clean::
-	@rm -f $(heimdalsrcdir)/lib/roken/roken.h
-
-#######################
-# Start SUBSYSTEM HEIMDAL_COM_ERR
-[SUBSYSTEM::HEIMDAL_COM_ERR]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
-# End SUBSYSTEM HEIMDAL_COM_ERR
-#######################
-
-HEIMDAL_COM_ERR_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/com_err/com_err.o \
-	$(heimdalsrcdir)/lib/com_err/error.o
-
-#######################
-# Start BINARY asn1_compile
-[BINARY::asn1_compile]
-USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN_H
-
-ASN1C = $(builddir)/bin/asn1_compile
-
-asn1_compile_ASN1_OBJ_FILES = \
-	$(heimdalsrcdir)/lib/asn1/main.ho \
-	$(heimdalsrcdir)/lib/asn1/gen.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_copy.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_decode.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_encode.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_free.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_glue.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_length.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_seq.ho \
-	$(heimdalsrcdir)/lib/asn1/gen_template.ho \
-	$(heimdalsrcdir)/lib/asn1/hash.ho \
-	$(heimdalsrcdir)/lib/asn1/symbol.ho \
-	$(heimdalsrcdir)/lib/asn1/asn1parse.ho \
-	$(heimdalsrcdir)/lib/asn1/lex.ho
-
-$(heimdalsrcdir)/lib/asn1/lex.c:: $(heimdalsrcdir)/lib/asn1/asn1parse.c
-dist:: $(heimdalsrcdir)/lib/asn1/lex.c
-
-asn1_compile_OBJ_FILES = \
-	$(asn1_compile_ASN1_OBJ_FILES) \
-	$(heimdalsrcdir)/lib/vers/print_version.ho
-
-$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-basics::  $(heimdalsrcdir)/lib/asn1/der-protos.h $(heimdalsrcdir)/lib/asn1/der-private.h
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/asn1/der-protos.h, \
-  -q -P comment -o, \
-  $(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES:.o=.c), \
-  $(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
-))
-
-$(eval $(call heimdal_proto_header_template, \
-  $(heimdalsrcdir)/lib/asn1/der-private.h, \
-  -q -P comment -p, \
-  $(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES:.o=.c), \
-  $(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
-))
-
-# End BINARY asn1_compile
-#######################
-
-#######################
-# Start BINARY compile_et
-[BINARY::compile_et]
-USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN_H
-# End BINARY compile_et
-#######################
-
-ET_COMPILER = $(builddir)/bin/compile_et
-
-compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
-	$(heimdalsrcdir)/lib/com_err/parse.ho \
-	$(heimdalsrcdir)/lib/com_err/lex.ho \
-	$(heimdalsrcdir)/lib/com_err/compile_et.ho
-
-$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-
-$(heimdalsrcdir)/lib/com_err/lex.c:: $(heimdalsrcdir)/lib/com_err/parse.c
-dist:: $(heimdalsrcdir)/lib/com_err/lex.c
-
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb |
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList |
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/krb5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --option-file=krb5.opt|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/cms.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1 --option-file=cms.opt|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo|
-
-mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/k524_err.et \$\(heimdalsrcdir\)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb_err.et \$\(heimdalsrcdir\)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb5_err.et \$\(heimdalsrcdir\)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/gssapi/krb5/gkrb5_err.et \$\(heimdalsrcdir\)/lib/gssapi|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/hx509/hx509_err.et \$\(heimdalsrcdir\)/lib/hx509|
-mkinclude perl_path_wrapper.sh et_deps.pl lib/wind/wind_err.et \$\(heimdalsrcdir\)/lib/wind|
-
-clean::	
-	@-rm -f bin/compile_et bin/asn1_compile
-
-#######################
-# Start BINARY compile_et
-[BINARY::samba4kinit]
-PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
-# End BINARY compile_et
-#######################
-
-samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \
-	$(heimdalsrcdir)/lib/vers/print_version.o 
-
-$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
-
-#######################
-# Start BINARY compile_et
-[BINARY::samba4kpasswd]
-PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
-# End BINARY compile_et
-#######################
-
-samba4kpasswd_OBJ_FILES = $(heimdalsrcdir)/kpasswd/kpasswd.o \
-	$(heimdalsrcdir)/lib/vers/print_version.o 
-
-$(samba4kpasswd_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
-
-#######################
-# Start BINARY compile_et
-[BINARY::rkpty]
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN OPENPTY
-# End BINARY compile_et
-#######################
-
-rkpty_OBJ_FILES = $(heimdalsrcdir)/lib/roken/rkpty.o \
-	$(socketwrappersrcdir)/socket_wrapper.o
-
-$(rkpty_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DPACKAGE=\"Samba\"
diff --git a/source4/install-sh b/source4/install-sh
deleted file mode 100755
index 58719246f0..0000000000
--- a/source4/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/source4/kdc/config.m4 b/source4/kdc/config.m4
deleted file mode 100644
index 409968e8b5..0000000000
--- a/source4/kdc/config.m4
+++ /dev/null
@@ -1 +0,0 @@
-SMB_ENABLE(server_service_kdc, $HAVE_KRB5)
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
deleted file mode 100644
index d54a46d273..0000000000
--- a/source4/kdc/config.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# KDC server subsystem
-
-#######################
-# Start SUBSYSTEM KDC
-[MODULE::KDC]
-INIT_FUNCTION = server_service_kdc_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		HEIMDAL_KDC HDB_SAMBA4 WDC_SAMBA4 LIBSAMBA-HOSTCONFIG \
-		LIBTSOCKET LIBSAMBA_TSOCKET
-# End SUBSYSTEM KDC
-#######################
-
-KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
-
-#######################
-# Start SUBSYSTEM HDB
-[SUBSYSTEM::HDB_SAMBA4]
-CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
-PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply CREDENTIALS \
-		HEIMDAL_HDB DB_GLUE LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM HDB
-#######################
-
-HDB_SAMBA4_OBJ_FILES = $(addprefix $(kdcsrcdir)/, hdb-samba4.o)
-
-#######################
-# Start SUBSYSTEM WDC
-[SUBSYSTEM::WDC_SAMBA4]
-CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
-PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply CREDENTIALS \
-		HEIMDAL_HDB PAC_GLUE LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM WDC
-#######################
-
-WDC_SAMBA4_OBJ_FILES = $(addprefix $(kdcsrcdir)/, wdc-samba4.o)
-
-#######################
-# Start SUBSYSTEM KDC
-[SUBSYSTEM::PAC_GLUE]
-CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
-PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply CREDENTIALS \
-		HEIMDAL_HDB LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM KDC
-#######################
-
-PAC_GLUE_OBJ_FILES = $(addprefix $(kdcsrcdir)/, pac-glue.o)
-
-#######################
-# Start SUBSYSTEM KDC
-[SUBSYSTEM::DB_GLUE]
-CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
-PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply CREDENTIALS \
-		HEIMDAL_HDB LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM KDC
-#######################
-
-DB_GLUE_OBJ_FILES = $(addprefix $(kdcsrcdir)/, db-glue.o)
-
-###############################################################
-# MIT KDC Plugin
-
-#######################
-# Start SUBSYSTEM MIT plugin
-[SUBSYSTEM::MIT_SAMBA]
-PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply CREDENTIALS \
-		HEIMDAL_HDB DB_GLUE PAC_GLUE LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM MIT plugin
-#######################
-
-MIT_SAMBA_OBJ_FILES = $(addprefix $(kdcsrcdir)/, mit_samba.o)
-
-###################################
-# Start Library mit_samba
-[LIBRARY::mit_samba]
-PRIVATE_DEPENDENCIES = MIT_SAMBA
-LIBRARY_REALNAME = mit_samba.$(SHLIBEXT)
-OUTPUT_TYPE = SHARED_LIBRARY
-ENABLE = YES
-# End Library mit_samba
-###################################
-
diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
deleted file mode 100644
index c8c25931fe..0000000000
--- a/source4/ldap_server/config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# LDAP server subsystem
-
-#######################
-# Start SUBSYSTEM LDAP
-[MODULE::LDAP]
-INIT_FUNCTION = server_service_ldap_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = CREDENTIALS \
-		LIBCLI_LDAP SAMDB \
-		process_model \
-		gensec \
-		LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM SMB
-#######################
-
-LDAP_OBJ_FILES = $(addprefix $(ldap_serversrcdir)/, \
-		ldap_server.o \
-		ldap_backend.o \
-		ldap_bind.o \
-		ldap_extended.o)
-
-$(eval $(call proto_header_template,$(ldap_serversrcdir)/proto.h,$(LDAP_OBJ_FILES:.o=.c)))
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
deleted file mode 100644
index 7df92d432d..0000000000
--- a/source4/lib/basic.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-[SUBSYSTEM::LZXPRESS]
-
-LZXPRESS_OBJ_FILES = $(libcompressionsrcdir)/lzxpress.o
-
-[SUBSYSTEM::GENCACHE]
-PRIVATE_DEPENDENCIES = TDB_WRAP
-
-GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o
-
-# PUBLIC_HEADERS += $(libgencachesrcdir)/gencache.h
-
-[SUBSYSTEM::LDB_WRAP]
-PUBLIC_DEPENDENCIES = LIBLDB
-PRIVATE_DEPENDENCIES = LDBSAMBA
-
-LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o
-PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h
-
-[SUBSYSTEM::TDB_WRAP]
-PUBLIC_DEPENDENCIES = LIBTDB
-
-TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
-PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
-
-SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)
-
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
deleted file mode 100644
index 4434ff3701..0000000000
--- a/source4/lib/cmdline/config.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
-
-LIBCMDLINE_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/credentials.o
-
-$(eval $(call proto_header_template,$(libcmdlinesrcdir)/credentials.h,$(LIBCMDLINE_CREDENTIALS_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::POPT_SAMBA]
-PUBLIC_DEPENDENCIES = LIBPOPT
-
-POPT_SAMBA_OBJ_FILES = $(libcmdlinesrcdir)/popt_common.o
-
-PUBLIC_HEADERS += $(libcmdlinesrcdir)/popt_common.h 
-
-[SUBSYSTEM::POPT_CREDENTIALS]
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-
-POPT_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/popt_credentials.o
-
-$(eval $(call proto_header_template,$(libcmdlinesrcdir)/popt_credentials.h,$(POPT_CREDENTIALS_OBJ_FILES:.o=.c)))
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
deleted file mode 100644
index 73836ef5f8..0000000000
--- a/source4/lib/com/config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-[SUBSYSTEM::COM]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR
-
-COM_OBJ_FILES = $(addprefix $(comsrcdir)/, tables.o rot.o main.o)
-
-[SUBSYSTEM::DCOM]
-PUBLIC_DEPENDENCIES = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
-					  RPC_NDR_OXIDRESOLVER
-
-DCOM_OBJ_FILES = $(addprefix $(comsrcdir)/dcom/, main.o tables.o)
-
-[MODULE::com_simple]
-SUBSYSTEM = COM
-INIT_FUNCTION = com_simple_init
-
-com_simple_OBJ_FILES = $(comsrcdir)/classes/simple.o
-
-[PYTHON::pycom]
-LIBRARY_REALNAME = samba/com.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = COM
-
-pycom_OBJ_FILES = $(comsrcdir)/pycom.o
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
deleted file mode 100644
index 5c7e1b7210..0000000000
--- a/source4/lib/events/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBEVENTS]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-CFLAGS = -Ilib/events
-
-LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, tevent_s4.o)
diff --git a/source4/lib/ldb-samba/config.mk b/source4/lib/ldb-samba/config.mk
deleted file mode 100644
index 392faade10..0000000000
--- a/source4/lib/ldb-samba/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################
-# Start SUBSYSTEM LDBSAMBA
-[SUBSYSTEM::LDBSAMBA]
-PUBLIC_DEPENDENCIES = LIBLDB
-PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_DRSBLOBS NDR_DNSP
-# End SUBSYSTEM LDBSAMBA
-################################################
-
-LDBSAMBA_OBJ_FILES = $(ldb_sambasrcdir)/ldif_handlers.o
-$(eval $(call proto_header_template,$(ldb_sambasrcdir)/ldif_handlers_proto.h,$(LDBSAMBA_OBJ_FILES:.o=.c)))
-
-
-[PYTHON::python_samba__ldb]
-LIBRARY_REALNAME = samba/_ldb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LDBSAMBA pyparam_util 
-
-python_samba__ldb_OBJ_FILES = $(ldb_sambasrcdir)/pyldb.o
diff --git a/source4/lib/ldb/external/libevents.m4 b/source4/lib/ldb/external/libevents.m4
deleted file mode 100644
index af046f1430..0000000000
--- a/source4/lib/ldb/external/libevents.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_SUBST(TEVENT_OBJ)
-AC_SUBST(TEVENT_CFLAGS)
-AC_SUBST(TEVENT_LIBS)
-
-AC_CHECK_HEADER(tevent.h,
-   [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"], , -ltalloc) ],
-   [PKG_CHECK_MODULES(TEVENT, tevent)])
diff --git a/source4/lib/ldb/external/libpopt.m4 b/source4/lib/ldb/external/libpopt.m4
deleted file mode 100644
index c5d12550ab..0000000000
--- a/source4/lib/ldb/external/libpopt.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-POPT_OBJ=""
-AC_SUBST(POPT_OBJ)
-AC_SUBST(POPT_LIBS)
-AC_SUBST(POPT_CFLAGS)
-
-AC_CHECK_HEADERS(popt.h)
-AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
diff --git a/source4/lib/ldb/external/libtalloc.m4 b/source4/lib/ldb/external/libtalloc.m4
deleted file mode 100644
index d41d3d1b34..0000000000
--- a/source4/lib/ldb/external/libtalloc.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_SUBST(TALLOC_OBJ)
-AC_SUBST(TALLOC_CFLAGS)
-AC_SUBST(TALLOC_LIBS)
-
-PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.2,
-	[ ],
-	[ AC_CHECK_HEADER(talloc.h, 
-		[ AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"])])])
diff --git a/source4/lib/ldb/external/libtdb.m4 b/source4/lib/ldb/external/libtdb.m4
deleted file mode 100644
index eb5a02030d..0000000000
--- a/source4/lib/ldb/external/libtdb.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_SUBST(TDB_OBJ)
-AC_SUBST(TDB_CFLAGS)
-AC_SUBST(TDB_LIBS)
-
-AC_CHECK_HEADER(tdb.h,
-   [AC_CHECK_LIB(tdb, tdb_open, [TDB_LIBS="-ltdb"]) ],
-   [PKG_CHECK_MODULES(TDB, tdb >= 1.2.0)])
diff --git a/source4/lib/ldb/external/pkg.m4 b/source4/lib/ldb/external/pkg.m4
deleted file mode 100644
index a8b3d06c81..0000000000
--- a/source4/lib/ldb/external/pkg.m4
+++ /dev/null
@@ -1,156 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk
deleted file mode 100644
index 6a1ef8164c..0000000000
--- a/source4/lib/ldb/ldb_ildap/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################
-# Start MODULE ldb_ildap
-[MODULE::ldb_ildap]
-SUBSYSTEM = LIBLDB
-CFLAGS = -I$(ldbsrcdir)/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
-INIT_FUNCTION = LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)
-ALIASES = ldapi ldaps ldap
-# End MODULE ldb_ildap
-################################################
-
-ldb_ildap_OBJ_FILES = $(ldbsrcdir)/ldb_ildap/ldb_ildap.o
-
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
deleted file mode 100644
index f0d0e85e6f..0000000000
--- a/source4/lib/ldb/tools/config.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBLDB_UTIL
-[SUBSYSTEM::LIBLDB_UTIL]
-CFLAGS = -I$(ldbsrcdir) -I$(ldbsrcdir)/include
-PUBLIC_DEPENDENCIES = LIBLDB
-# End SUBSYSTEM LIBLDB_UTIL
-################################################
-
-LIBLDB_UTIL_OBJ_FILES = $(ldbsrcdir)/tools/ldbutil.o
-
-################################################
-# Start SUBSYSTEM LIBLDB_CMDLINE
-[SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -I$(ldbsrcdir) -I$(ldbsrcdir)/include
-PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
-# End SUBSYSTEM LIBLDB_CMDLINE
-################################################
-
-LIBLDB_CMDLINE_OBJ_FILES = $(ldbsrcdir)/tools/cmdline.o
-
-################################################
-# Start BINARY ldbadd
-[BINARY::ldbadd]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE LIBCLI_RESOLVE
-# End BINARY ldbadd
-################################################
-
-
-ldbadd_OBJ_FILES = $(ldbsrcdir)/tools/ldbadd.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbadd.1
-
-################################################
-# Start BINARY ldbdel
-[BINARY::ldbdel]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE
-# End BINARY ldbdel
-################################################
-
-ldbdel_OBJ_FILES = $(ldbsrcdir)/tools/ldbdel.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbdel.1
-
-################################################
-# Start BINARY ldbmodify
-[BINARY::ldbmodify]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE
-# End BINARY ldbmodify
-################################################
-
-ldbmodify_OBJ_FILES = $(ldbsrcdir)/tools/ldbmodify.o
-MANPAGES += $(ldbsrcdir)/man/ldbmodify.1
-
-################################################
-# Start BINARY ldbsearch
-[BINARY::ldbsearch]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE 
-# End BINARY ldbsearch
-################################################
-
-ldbsearch_OBJ_FILES = $(ldbsrcdir)/tools/ldbsearch.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbsearch.1
-
-################################################
-# Start BINARY ldbedit
-[BINARY::ldbedit]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-# End BINARY ldbedit
-################################################
-
-ldbedit_OBJ_FILES = $(ldbsrcdir)/tools/ldbedit.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbedit.1
-
-################################################
-# Start BINARY ldbrename
-[BINARY::ldbrename]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-# End BINARY ldbrename
-################################################
-
-ldbrename_OBJ_FILES = $(ldbsrcdir)/tools/ldbrename.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbrename.1
-
-
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
deleted file mode 100644
index 1cdbbc6d76..0000000000
--- a/source4/lib/messaging/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-[SUBSYSTEM::MESSAGING]
-PUBLIC_DEPENDENCIES = \
-		LIBSAMBA-UTIL \
-		TDB_WRAP \
-		NDR_IRPC \
-		UNIX_PRIVS \
-		UTIL_TDB \
-		CLUSTER \
-		LIBNDR \
-		samba_socket
-
-MESSAGING_OBJ_FILES = $(libmessagingsrcdir)/messaging.o
-
-[PYTHON::python_messaging]
-LIBRARY_REALNAME = samba/messaging.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = MESSAGING LIBEVENTS python_irpc pyparam_util
-
-python_messaging_OBJ_FILES = $(libmessagingsrcdir)/pymessaging.o
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
deleted file mode 100644
index bc87644ef7..0000000000
--- a/source4/lib/policy/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-[SUBSYSTEM::policy]
-PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
-
-policy_OBJ_FILES = $(policydir)/gp_ldap.o $(policydir)/gp_filesys.c $(policydir)/gp_manage.c $(policydir)/gp_ini.c
-
-PC_FILES += $(policydir)/policy.pc
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
deleted file mode 100644
index 9ff917f75a..0000000000
--- a/source4/lib/registry/config.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-[SUBSYSTEM::TDR_REGF]
-PUBLIC_DEPENDENCIES = TDR 
-
-TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o
-
-# Special support for external builddirs
-$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.c: $(libregistrysrcdir)/regf.idl
-	@CPP="$(CPP)" $(PERL) $(pidldir)/pidl $(PIDL_ARGS) \
-		--header --outputdir=$(libregistrysrcdir) \
-		--tdr-parser -- $(libregistrysrcdir)/regf.idl
-
-clean::
-	@-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf*
-
-################################################
-# Start SUBSYSTEM registry
-[LIBRARY::registry]
-PUBLIC_DEPENDENCIES = \
-		LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
-		RPC_NDR_WINREG LDB_WRAP
-# End MODULE registry_ldb
-################################################
-
-PC_FILES += $(libregistrysrcdir)/registry.pc
-
-registry_VERSION = 0.0.1
-registry_SOVERSION = 0
-
-registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/, interface.o util.o samba.o \
-					patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
-					hive.o local.o ldb.o dir.o rpc.o) \
-					../libcli/registry/util_reg.o
-
-PUBLIC_HEADERS += $(libregistrysrcdir)/registry.h
-
-[SUBSYSTEM::registry_common]
-PUBLIC_DEPENDENCIES = registry
-
-registry_common_OBJ_FILES = $(libregistrysrcdir)/tools/common.o
-
-$(eval $(call proto_header_template,$(libregistrysrcdir)/tools/common.h,$(registry_common_OBJ_FILES:.o=.c)))
-
-################################################
-# Start BINARY regdiff
-[BINARY::regdiff]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
-# End BINARY regdiff
-################################################
-
-regdiff_OBJ_FILES = $(libregistrysrcdir)/tools/regdiff.o
-
-MANPAGES += $(libregistrysrcdir)/man/regdiff.1
-
-################################################
-# Start BINARY regpatch
-[BINARY::regpatch]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
-		registry_common
-# End BINARY regpatch
-################################################
-
-regpatch_OBJ_FILES = $(libregistrysrcdir)/tools/regpatch.o
-
-MANPAGES += $(libregistrysrcdir)/man/regpatch.1
-
-################################################
-# Start BINARY regshell
-[BINARY::regshell]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
-		SMBREADLINE registry_common
-# End BINARY regshell
-################################################
-
-regshell_OBJ_FILES = $(libregistrysrcdir)/tools/regshell.o
-
-MANPAGES += $(libregistrysrcdir)/man/regshell.1
-
-################################################
-# Start BINARY regtree
-[BINARY::regtree]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
-		registry_common
-# End BINARY regtree
-################################################
-
-regtree_OBJ_FILES = $(libregistrysrcdir)/tools/regtree.o
-
-MANPAGES += $(libregistrysrcdir)/man/regtree.1
-
-[SUBSYSTEM::torture_registry]
-PRIVATE_DEPENDENCIES = torture registry
-
-torture_registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/tests/, generic.o hive.o diff.o registry.o)
-
-$(eval $(call proto_header_template,$(libregistrysrcdir)/tests/proto.h,$(torture_registry_OBJ_FILES:.o=.c)))
-
-[PYTHON::py_registry]
-LIBRARY_REALNAME = samba/registry.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = registry PYTALLOC pycredentials pyparam_util
-
-py_registry_OBJ_FILES = $(libregistrysrcdir)/pyregistry.o
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
deleted file mode 100644
index 365347fe21..0000000000
--- a/source4/lib/samba3/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBSAMBA3
-[SUBSYSTEM::SMBPASSWD]
-PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL
-# End SUBSYSTEM LIBSAMBA3
-################################################
-
-SMBPASSWD_OBJ_FILES = $(libsrcdir)/samba3/smbpasswd.o
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
deleted file mode 100644
index fa987a1f46..0000000000
--- a/source4/lib/socket/config.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_CHECK_FUNCS(writev)
-AC_CHECK_FUNCS(readv)
-
-############################################
-# check for unix domain sockets
-# done by AC_LIBREPLACE_NETWORK_CHECKS
-SMB_ENABLE(socket_unix, NO)
-if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
-	SMB_ENABLE(socket_unix, YES)
-fi
-
-############################################
-# check for ipv6
-# done by AC_LIBREPLACE_NETWORK_CHECKS
-SMB_ENABLE(socket_ipv6, NO)
-if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-    SMB_ENABLE(socket_ipv6, YES)
-fi
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
deleted file mode 100644
index 07491e115a..0000000000
--- a/source4/lib/socket/config.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-##############################
-# Start SUBSYSTEM LIBNETIF
-[SUBSYSTEM::LIBNETIF]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
-# End SUBSYSTEM LIBNETIF
-##############################
-
-LIBNETIF_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, interface.o netif.o)
-
-$(eval $(call proto_header_template,$(libsocketsrcdir)/netif_proto.h,$(LIBNETIF_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE socket_ip
-[MODULE::socket_ip]
-SUBSYSTEM = samba_socket
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
-# End MODULE socket_ip
-################################################
-
-socket_ip_OBJ_FILES = $(libsocketsrcdir)/socket_ip.o
-
-################################################
-# Start MODULE socket_unix
-[MODULE::socket_unix]
-SUBSYSTEM = samba_socket
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-# End MODULE socket_unix
-################################################
-
-socket_unix_OBJ_FILES = $(libsocketsrcdir)/socket_unix.o
-
-################################################
-# Start SUBSYSTEM SOCKET
-[SUBSYSTEM::samba_socket]
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBTSOCKET
-PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
-# End SUBSYSTEM SOCKET
-################################################
-
-samba_socket_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, socket.o access.o connect_multi.o connect.o)
-
diff --git a/source4/lib/stream/config.mk b/source4/lib/stream/config.mk
deleted file mode 100644
index 56d117e7bd..0000000000
--- a/source4/lib/stream/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::LIBPACKET]
-PRIVATE_DEPENDENCIES = LIBTLS
-
-LIBPACKET_OBJ_FILES = $(libstreamsrcdir)/packet.o
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
deleted file mode 100644
index 8a5b996638..0000000000
--- a/source4/lib/tls/config.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################
-# start SMB_EXT_LIB_GNUTLS
-# check for gnutls/gnutls.h and -lgnutls
-
-use_gnutls=auto
-AC_ARG_ENABLE(gnutls,
-AS_HELP_STRING([--enable-gnutls],[Turn on gnutls support (default=yes)]),
-    [if test x$enable_gnutls = xno; then
-        use_gnutls=no
-    fi])
-
-
-if test x$use_gnutls = xauto && pkg-config --exists gnutls; then
-	SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls >= 1.4.0, 
-							   [use_gnutls=yes], 
-							   [use_gnutls=no])
-fi
-	
-if test x$use_gnutls = xauto; then
-	AC_CHECK_HEADERS(gnutls/gnutls.h)
-	AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
-	AC_CHECK_DECL(gnutls_x509_crt_set_version,  
-				  [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
-	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-		SMB_ENABLE(GNUTLS,YES)
-		AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
-					  [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
-	fi
-	SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
-fi
-if test x$use_gnutls = xyes; then
-	#Some older versions have a different type name
-	AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
-	AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
-	AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
-	AC_CHECK_HEADERS(gcrypt.h)
-	AC_CHECK_LIB_EXT(gcrypt, GCRYPT_LIBS, gcry_control)
-	# On Solaris libgcrypt.so has a bug and seems to be not linked
-	# to libgpg-error.so, so we need to manually add them...
-	AC_CHECK_LIB_EXT(gpg-error, GCRYPT_LIBS, gpg_err_code_from_errno)
-	SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS)
-fi
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
deleted file mode 100644
index 0e1978cc1b..0000000000
--- a/source4/lib/tls/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBTLS]
-PUBLIC_DEPENDENCIES = \
-		LIBTALLOC GNUTLS GCRYPT LIBSAMBA-HOSTCONFIG samba_socket
-
-LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)
diff --git a/source4/lib/wmi/config.mk b/source4/lib/wmi/config.mk
deleted file mode 100644
index 3bb1690c7b..0000000000
--- a/source4/lib/wmi/config.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-[SUBSYSTEM::WMI]
-PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
-		NDR_DCOM \
-		RPC_NDR_REMACT \
-		NDR_TABLE \
-		DCOM_PROXY_DCOM \
-		DCOM
-
-WMI_OBJ_FILES = $(addprefix $(wmisrcdir)/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
-
-#################################
-# Start BINARY wmic
-[BINARY::wmic]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-                POPT_SAMBA \
-                POPT_CREDENTIALS \
-                LIBPOPT \
-				WMI
-
-wmic_OBJ_FILES = $(wmisrcdir)/tools/wmic.o
-# End BINARY wmic
-#################################
-
-#################################
-# Start BINARY wmis
-[BINARY::wmis]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-                POPT_SAMBA \
-                POPT_CREDENTIALS \
-                LIBPOPT \
-				WMI
-
-wmis_OBJ_FILES = \
-                $(wmisrcdir)/tools/wmis.o
-
-# End BINARY wmis
-#################################
-
-librpc/gen_ndr/dcom_p.c: idl
-
-#######################
-# Start LIBRARY swig_dcerpc
-[PYTHON::pywmi]
-PUBLIC_DEPENDENCIES = LIBCLI_SMB LIBNDR LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI
-
-$(eval $(call python_py_module_template,wmi.py,$(wmisrcdir)/wmi.py))
-
-pywmi_OBJ_FILES = $(wmisrcdir)/wmi_wrap.o
-$(pywmi_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
-
-# End LIBRARY swig_dcerpc
-#######################
-
-#################################
-# Start BINARY pdhc
-#[BINARY::pdhc]
-#INSTALLDIR = BINDIR
-#OBJ_FILES = \
-#                pdhc.o
-#PRIVATE_DEPENDENCIES = \
-#                POPT_SAMBA \
-#                POPT_CREDENTIALS \
-#                LIBPOPT \
-#		NDR_TABLE \
-#		RPC_NDR_WINREG
-# End BINARY pdhc
-#################################
diff --git a/source4/lib/zlib.mk b/source4/lib/zlib.mk
deleted file mode 100644
index 5c5e6e69ba..0000000000
--- a/source4/lib/zlib.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-[SUBSYSTEM::ZLIB]
-CFLAGS = -I$(zlibsrcdir)
-
-ZLIB_OBJ_FILES = \
-		$(zlibsrcdir)/adler32.o \
-		$(zlibsrcdir)/compress.o \
-		$(zlibsrcdir)/crc32.o \
-		$(zlibsrcdir)/gzio.o \
-		$(zlibsrcdir)/uncompr.o \
-		$(zlibsrcdir)/deflate.o \
-		$(zlibsrcdir)/trees.o \
-		$(zlibsrcdir)/zutil.o \
-		$(zlibsrcdir)/inflate.o \
-		$(zlibsrcdir)/infback.o \
-		$(zlibsrcdir)/inftrees.o \
-		$(zlibsrcdir)/inffast.o
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
deleted file mode 100644
index e8741d165a..0000000000
--- a/source4/libcli/config.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-mkinclude ldap/config.mk
-mkinclude security/config.mk
-mkinclude wbclient/config.mk
-
-[SUBSYSTEM::LIBSAMBA-ERRORS]
-
-LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix ../libcli/util/, doserr.o ) $(libclisrcdir)/util/errormap.o $(libclisrcdir)/util/nterr.o
-
-PUBLIC_HEADERS += $(addprefix ../libcli/util/, error.h ntstatus.h doserr.h werror.h)
-
-[SUBSYSTEM::LIBSAMBA_TSOCKET]
-PUBLIC_DEPENDENCIES = LIBTSOCKET UTIL_TEVENT
-
-LIBSAMBA_TSOCKET_OBJ_FILES = $(addprefix ../libcli/util/, tstream.o)
-
-[SUBSYSTEM::LIBCLI_LSA]
-PUBLIC_DEPENDENCIES = RPC_NDR_LSA
-PRIVATE_DEPENDENCIES = LIBSECURITY
-
-LIBCLI_LSA_OBJ_FILES = $(libclisrcdir)/util/clilsa.o
-
-$(eval $(call proto_header_template,$(libclisrcdir)/util/clilsa.h,$(LIBCLI_LSA_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_COMPOSITE]
-PUBLIC_DEPENDENCIES = LIBEVENTS
-
-LIBCLI_COMPOSITE_OBJ_FILES = $(libclisrcdir)/composite/composite.o
-$(eval $(call proto_header_template,$(libclisrcdir)/composite/proto.h,$(LIBCLI_COMPOSITE_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
-PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE
-
-LIBCLI_SMB_COMPOSITE_OBJ_FILES = $(addprefix $(libclisrcdir)/smb_composite/, \
-	loadfile.o \
-	savefile.o \
-	connect.o \
-	sesssetup.o \
-	fetchfile.o \
-	appendacl.o \
-	fsinfo.o \
-	smb2.o)
-
-$(eval $(call proto_header_template,$(libclisrcdir)/smb_composite/proto.h,$(LIBCLI_SMB_COMPOSITE_OBJ_FILES:.o=.c)))
-
-[PYTHON::python_netbios]
-LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
-
-python_netbios_OBJ_FILES = $(libclinbtsrcdir)/pynbt.o
-
-[SUBSYSTEM::LIBCLI_DGRAM]
-PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON
-
-LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \
-	dgramsocket.o \
-	mailslot.o \
-	netlogon.o \
-	browse.o)
-
-[SUBSYSTEM::LIBCLI_WREPL]
-PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBEVENTS UTIL_TEVENT LIBTSOCKET LIBSAMBA_TSOCKET
-
-LIBCLI_WREPL_OBJ_FILES = $(libclisrcdir)/wrepl/winsrepl.o
-
-$(eval $(call proto_header_template,$(libclisrcdir)/wrepl/winsrepl_proto.h,$(LIBCLI_WREPL_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_RESOLVE]
-PUBLIC_DEPENDENCIES = NDR_NBT LIBTSOCKET
-
-LIBCLI_RESOLVE_OBJ_FILES = $(libclisrcdir)/resolve/resolve.o
-
-$(eval $(call proto_header_template,$(libclisrcdir)/resolve/proto.h,$(LIBCLI_RESOLVE_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LP_RESOLVE]
-PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF 
-
-LP_RESOLVE_OBJ_FILES = $(addprefix $(libclisrcdir)/resolve/, \
-					  bcast.o nbtlist.o wins.o \
-					  dns_ex.o file.o \
-					  host.o resolve_lp.o)
-
-$(eval $(call proto_header_template,$(libclisrcdir)/resolve/lp_proto.h,$(LP_RESOLVE_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_FINDDCS]
-PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
-
-LIBCLI_FINDDCS_OBJ_FILES = $(libclisrcdir)/finddcs.o
-
-$(eval $(call proto_header_template,$(libclisrcdir)/finddcs.h,$(LIBCLI_FINDDCS_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_SMB]
-PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
-	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket
-
-LIBCLI_SMB_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
-		clireadwrite.o \
-		cliconnect.o \
-		clifile.o \
-		clilist.o \
-		clitrans2.o \
-		climessage.o \
-		clideltree.o)
-
-$(eval $(call proto_header_template,$(libclisrcdir)/libcli_proto.h,$(LIBCLI_SMB_OBJ_FILES:.o=.c)))
-
-# PUBLIC_HEADERS += $(libclisrcdir)/libcli.h
-
-[SUBSYSTEM::LIBCLI_RAW]
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
-#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
-PUBLIC_DEPENDENCIES = samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON
-
-LIBCLI_RAW_OBJ_FILES = $(addprefix $(libclisrcdir)/raw/, rawfile.o smb_signing.o clisocket.o \
-					  clitransport.o clisession.o clitree.o clierror.o rawrequest.o \
-					  rawreadwrite.o rawsearch.o rawsetfileinfo.o raweas.o rawtrans.o \
-					  clioplock.o rawnegotiate.o rawfsinfo.o rawfileinfo.o rawnotify.o \
-					  rawioctl.o rawacl.o rawdate.o rawlpq.o rawshadow.o)
-
-
-$(eval $(call proto_header_template,$(libclisrcdir)/raw/raw_proto.h,$(LIBCLI_RAW_OBJ_FILES:.o=.c)))
-
-mkinclude smb2/config.mk
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
deleted file mode 100644
index f0c0f5295d..0000000000
--- a/source4/libcli/ldap/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-[SUBSYSTEM::LIBCLI_LDAP]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTEVENT LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS \
-		       LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE
-
-LIBCLI_LDAP_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
-					   ldap_client.o ldap_bind.o \
-					   ldap_ildap.o ldap_controls.o)
-PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap.h
-
-$(eval $(call proto_header_template,$(libclisrcdir)/ldap/ldap_proto.h,$(LIBCLI_LDAP_OBJ_FILES:.o=.c)))
-
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
deleted file mode 100644
index 21de2ae246..0000000000
--- a/source4/libcli/security/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-[SUBSYSTEM::LIBSECURITY]
-PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON
-
-LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \
-						security_token.o access_check.o privilege.o \
-						create_descriptor.o object_tree.o)
-
-$(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c)))
diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk
deleted file mode 100644
index ddd45c965f..0000000000
--- a/source4/libcli/smb2/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-[SUBSYSTEM::LIBCLI_SMB2]
-PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBPACKET gensec
-
-LIBCLI_SMB2_OBJ_FILES = $(addprefix $(libclisrcdir)/smb2/, \
-	transport.o request.o negprot.o session.o tcon.o \
-	create.o close.o connect.o getinfo.o write.o read.o \
-	setinfo.o find.o ioctl.o logoff.o tdis.o flush.o \
-	lock.o notify.o cancel.o keepalive.o break.o util.o signing.o \
-	lease_break.o)
-
-$(eval $(call proto_header_template,$(libclisrcdir)/smb2/smb2_proto.h,$(LIBCLI_SMB2_OBJ_FILES:.o=.c)))
diff --git a/source4/libcli/wbclient/config.mk b/source4/libcli/wbclient/config.mk
deleted file mode 100644
index af4d3eff82..0000000000
--- a/source4/libcli/wbclient/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBWBCLIENT_OLD]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS
-PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING
-
-LIBWBCLIENT_OLD_OBJ_FILES = $(libclisrcdir)/wbclient/wbclient.o
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
deleted file mode 100644
index 3e9cfbc836..0000000000
--- a/source4/libnet/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-[SUBSYSTEM::LIBSAMBA-NET]
-PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET
-
-LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetsrcdir)/, \
-	libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \
-	libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \
-	libnet_vampire.o libnet_samdump.o \
-	libnet_samsync_ldb.o libnet_user.o libnet_group.o libnet_share.o \
-	libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \
-	groupman.o prereq_domain.o libnet_samsync.o libnet_export_keytab.o)
-
-$(eval $(call proto_header_template,$(libnetsrcdir)/libnet_proto.h,$(LIBSAMBA-NET_OBJ_FILES:.o=.c)))
-
-[PYTHON::python_net]
-LIBRARY_REALNAME = samba/net.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBSAMBA-NET
-
-python_net_OBJ_FILES = $(libnetsrcdir)/py_net.o
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
deleted file mode 100644
index 3c231d6af6..0000000000
--- a/source4/librpc/config.mk
+++ /dev/null
@@ -1,768 +0,0 @@
-ndrsrcdir = $(librpcsrcdir)/ndr
-gen_ndrsrcdir = $(librpcsrcdir)/gen_ndr
-dcerpcsrcdir = $(librpcsrcdir)/rpc
-
-################################################
-# Start SUBSYSTEM LIBNDR
-[LIBRARY::LIBNDR]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
-					  LIBSAMBA-HOSTCONFIG
-
-LIBNDR_OBJ_FILES = ../librpc/ndr/ndr_string.o ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o ../librpc/gen_ndr/ndr_misc.o ../librpc/ndr/ndr_misc.o
-
-PC_FILES += ../librpc/ndr.pc
-LIBNDR_VERSION = 0.0.1
-LIBNDR_SOVERSION = 0
-
-# End SUBSYSTEM LIBNDR
-################################################
-
-PUBLIC_HEADERS += ../librpc/ndr/libndr.h
-PUBLIC_HEADERS += ../librpc/gen_ndr/misc.h ../librpc/gen_ndr/ndr_misc.h
-
-#################################
-# Start BINARY ndrdump
-[BINARY::ndrdump]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		NDR_TABLE \
-		LIBSAMBA-ERRORS
-# FIXME: ndrdump shouldn't have to depend on RPC...
-# End BINARY ndrdump
-#################################
-
-ndrdump_OBJ_FILES = ../librpc/tools/ndrdump.o
-
-MANPAGES += ../librpc/tools/ndrdump.1
-
-################################################
-# Start SUBSYSTEM NDR_COMPRESSION
-[SUBSYSTEM::NDR_COMPRESSION]
-PRIVATE_DEPENDENCIES = ZLIB LZXPRESS
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBNDR
-# End SUBSYSTEM NDR_COMPRESSION
-################################################
-
-NDR_COMPRESSION_OBJ_FILES = ../librpc/ndr/ndr_compression.o
-
-[SUBSYSTEM::NDR_SECURITY]
-PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY
-
-NDR_SECURITY_OBJ_FILES = ../librpc/gen_ndr/ndr_security.o \
-			 ../librpc/ndr/ndr_sec_helper.o \
-			 $(gen_ndrsrcdir)/ndr_server_id.o
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/security.h
-PUBLIC_HEADERS += $(gen_ndrsrcdir)/server_id.h
-
-[SUBSYSTEM::NDR_AUDIOSRV]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_AUDIOSRV_OBJ_FILES = ../librpc/gen_ndr/ndr_audiosrv.o
-
-[SUBSYSTEM::NDR_NAMED_PIPE_AUTH]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_NAMED_PIPE_AUTH_OBJ_FILES = ../librpc/gen_ndr/ndr_named_pipe_auth.o
-
-[SUBSYSTEM::NDR_DNSSERVER]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DNSSERVER_OBJ_FILES = ../librpc/gen_ndr/ndr_dnsserver.o
-
-[SUBSYSTEM::NDR_WINSTATION]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_WINSTATION_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winstation.o
-
-[SUBSYSTEM::NDR_IRPC]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
-
-NDR_IRPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_irpc.o
-
-[SUBSYSTEM::NDR_DCOM]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_ORPC
-
-NDR_DCOM_OBJ_FILES = ../librpc/gen_ndr/ndr_dcom.o
-
-[SUBSYSTEM::NDR_WMI]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_DCOM
-
-NDR_WMI_OBJ_FILES = ../librpc/gen_ndr/ndr_wmi.o ../librpc/ndr/ndr_wmi.o
-
-[SUBSYSTEM::NDR_DSBACKUP]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DSBACKUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dsbackup.o
-
-[SUBSYSTEM::NDR_EFS]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
-
-NDR_EFS_OBJ_FILES = ../librpc/gen_ndr/ndr_efs.o
-
-[SUBSYSTEM::NDR_ROT]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
-
-NDR_ROT_OBJ_FILES = ../librpc/gen_ndr/ndr_rot.o
-
-[SUBSYSTEM::NDR_FRSRPC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_FRSRPC_OBJ_FILES = ../librpc/gen_ndr/ndr_frsrpc.o ../librpc/ndr/ndr_frsrpc.o
-
-[SUBSYSTEM::NDR_FRSAPI]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_FRSAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_frsapi.o
-
-[SUBSYSTEM::NDR_FRSTRANS]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_FRSTRANS_OBJ_FILES = ../librpc/gen_ndr/ndr_frstrans.o
-
-[SUBSYSTEM::NDR_DRSUAPI]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL
-
-NDR_DRSUAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_drsuapi.o ../librpc/ndr/ndr_drsuapi.o
-
-[SUBSYSTEM::NDR_DRSBLOBS]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_DRSUAPI
-
-NDR_DRSBLOBS_OBJ_FILES = ../librpc/gen_ndr/ndr_drsblobs.o ../librpc/ndr/ndr_drsblobs.o
-
-[SUBSYSTEM::NDR_DFSBLOBS]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DFSBLOBS_OBJ_FILES = ../librpc/gen_ndr/ndr_dfsblobs.o
-
-[SUBSYSTEM::NDR_SASL_HELPERS]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_SASL_HELPERS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_sasl_helpers.o
-
-[SUBSYSTEM::NDR_POLICYAGENT]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_POLICYAGENT_OBJ_FILES = ../librpc/gen_ndr/ndr_policyagent.o
-
-[SUBSYSTEM::NDR_UNIXINFO]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
-
-NDR_UNIXINFO_OBJ_FILES = ../librpc/gen_ndr/ndr_unixinfo.o
-
-[SUBSYSTEM::NDR_NFS4ACL]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
-
-NDR_NFS4ACL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_nfs4acl.o
-
-[SUBSYSTEM::NDR_SPOOLSS]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
-
-NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss.o
-
-[SUBSYSTEM::NDR_SPOOLSS_BUF]
-
-NDR_SPOOLSS_BUF_OBJ_FILES = ../librpc/ndr/ndr_spoolss_buf.o
-
-[SUBSYSTEM::NDR_EPMAPPER]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_EPMAPPER_OBJ_FILES = ../librpc/gen_ndr/ndr_epmapper.o
-
-[SUBSYSTEM::NDR_DBGIDL]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DBGIDL_OBJ_FILES = ../librpc/gen_ndr/ndr_dbgidl.o
-
-[SUBSYSTEM::NDR_DSSETUP]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DSSETUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dssetup.o
-
-[SUBSYSTEM::NDR_MSGSVC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_MSGSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_msgsvc.o
-
-[SUBSYSTEM::NDR_WINSIF]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_WINSIF_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winsif.o
-
-[SUBSYSTEM::NDR_MGMT]
-PUBLIC_DEPENDENCIES = LIBNDR 
-
-NDR_MGMT_OBJ_FILES = ../librpc/gen_ndr/ndr_mgmt.o
-
-[SUBSYSTEM::NDR_PROTECTED_STORAGE]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_PROTECTED_STORAGE_OBJ_FILES = ../librpc/gen_ndr/ndr_protected_storage.o
-
-[SUBSYSTEM::NDR_ORPC]
-PUBLIC_DEPENDENCIES = LIBNDR 
-
-NDR_ORPC_OBJ_FILES = ../librpc/gen_ndr/ndr_orpc.o ../librpc/ndr/ndr_orpc.o 
-
-[SUBSYSTEM::NDR_OXIDRESOLVER]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
-
-NDR_OXIDRESOLVER_OBJ_FILES = ../librpc/gen_ndr/ndr_oxidresolver.o
-
-[SUBSYSTEM::NDR_REMACT]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
-
-NDR_REMACT_OBJ_FILES = ../librpc/gen_ndr/ndr_remact.o
-
-[SUBSYSTEM::NDR_WZCSVC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_WZCSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wzcsvc.o
-
-[SUBSYSTEM::NDR_BROWSER]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_BROWSER_OBJ_FILES = ../librpc/gen_ndr/ndr_browser.o
-
-[SUBSYSTEM::NDR_W32TIME]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_W32TIME_OBJ_FILES = ../librpc/gen_ndr/ndr_w32time.o
-
-[SUBSYSTEM::NDR_SCERPC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc.o
-
-[SUBSYSTEM::NDR_TRKWKS]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_TRKWKS_OBJ_FILES = ../librpc/gen_ndr/ndr_trkwks.o
-
-[SUBSYSTEM::NDR_KEYSVC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc.o
-
-[SUBSYSTEM::NDR_KRB5PAC]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_STANDARD NDR_SECURITY
-
-NDR_KRB5PAC_OBJ_FILES = ../librpc/gen_ndr/ndr_krb5pac.o ../librpc/ndr/ndr_krb5pac.o
-
-[SUBSYSTEM::NDR_XATTR]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
-
-NDR_XATTR_OBJ_FILES = ../librpc/gen_ndr/ndr_xattr.o ../librpc/ndr/ndr_xattr.o
-
-[SUBSYSTEM::NDR_OPENDB]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_OPENDB_OBJ_FILES = $(gen_ndrsrcdir)/ndr_opendb.o
-
-[SUBSYSTEM::NDR_NOTIFY]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_NOTIFY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_notify.o
-
-[SUBSYSTEM::NDR_SCHANNEL]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
-
-NDR_SCHANNEL_OBJ_FILES = ../librpc/gen_ndr/ndr_schannel.o ../librpc/ndr/ndr_schannel.o
-
-[SUBSYSTEM::NDR_NBT]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON
-
-NDR_NBT_OBJ_FILES = ../librpc/gen_ndr/ndr_nbt.o
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/nbt.h
-
-[SUBSYSTEM::NDR_NTP_SIGND]
-PUBLIC_DEPENDENCIES = LIBNDR 
-
-NDR_NTP_SIGND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_ntp_signd.o
-
-[SUBSYSTEM::NDR_WINSREPL]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
-
-NDR_WINSREPL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winsrepl.o
-
-[SUBSYSTEM::NDR_WINBIND]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_STANDARD
-
-NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o
-#PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h
-
-[SUBSYSTEM::NDR_NTLMSSP]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_STANDARD
-
-NDR_NTLMSSP_OBJ_FILES = ../librpc/gen_ndr/ndr_ntlmssp.o ../librpc/ndr/ndr_ntlmssp.o
-
-[SUBSYSTEM::NDR_NTPRINTING]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_STANDARD
-
-NDR_NTPRINTING_OBJ_FILES = ../librpc/gen_ndr/ndr_ntprinting.o ../librpc/ndr/ndr_ntprinting.o
-
-[SUBSYSTEM::NDR_DNSP]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DNSP_OBJ_FILES = ../librpc/gen_ndr/ndr_dnsp.o ../librpc/ndr/ndr_dnsp.o
-
-$(librpcsrcdir)/idl-deps:
-	$(PERL) $(librpcsrcdir)/idl-deps.pl $(wildcard $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl) >$@
-
-clean:: 
-	rm -f $(librpcsrcdir)/idl-deps
-
--include $(librpcsrcdir)/idl-deps
-
-$(gen_ndrsrcdir)/tables.c: $(IDL_NDR_PARSE_H_FILES)
-	@echo Generating $@
-	@$(PERL) ../librpc/tables.pl --output=$@ $^ > $(gen_ndrsrcdir)/tables.x
-	@mv $(gen_ndrsrcdir)/tables.x $@
-
-[LIBRARY::NDR_STANDARD]
-PUBLIC_DEPENDENCIES = LIBNDR
-PRIVATE_DEPENDENCIES = NDR_SECURITY
-
-NDR_STANDARD_OBJ_FILES = ../librpc/gen_ndr/ndr_echo.o \
-						 ../librpc/gen_ndr/ndr_lsa.o \
-						 ../librpc/gen_ndr/ndr_samr.o \
-						 ../librpc/gen_ndr/ndr_netlogon.o \
-						 ../librpc/ndr/ndr_netlogon.o \
-						 ../librpc/gen_ndr/ndr_dfs.o \
-						 ../librpc/gen_ndr/ndr_atsvc.o \
-						 ../librpc/gen_ndr/ndr_wkssvc.o \
-						 ../librpc/gen_ndr/ndr_srvsvc.o \
-						 ../librpc/gen_ndr/ndr_svcctl.o \
-						 ../librpc/ndr/ndr_svcctl.o \
-						 ../librpc/gen_ndr/ndr_winreg.o \
-						 ../librpc/gen_ndr/ndr_initshutdown.o \
-						 ../librpc/gen_ndr/ndr_eventlog.o \
-						 ../librpc/gen_ndr/ndr_ntsvcs.o
-
-PC_FILES += ../librpc/ndr_standard.pc
-
-PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, samr.h ndr_samr.h lsa.h netlogon.h atsvc.h ndr_atsvc.h ndr_svcctl.h svcctl.h)
-
-NDR_STANDARD_VERSION = 0.0.1
-NDR_STANDARD_SOVERSION = 0
-
-[SUBSYSTEM::NDR_TABLE]
-PUBLIC_DEPENDENCIES = \
-	NDR_STANDARD \
-	NDR_AUDIOSRV \
-	NDR_DSBACKUP NDR_EFS NDR_DRSUAPI \
-	NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS \
-	NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF \
-	NDR_MGMT NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER \
-	NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC \
-	NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
-	NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL NDR_SECURITY \
-	NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB \
-	NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND \
-	NDR_FRSRPC NDR_FRSAPI NDR_FRSTRANS \
-	NDR_NFS4ACL NDR_NTP_SIGND \
-	NDR_DCOM NDR_WMI NDR_NAMED_PIPE_AUTH \
-	NDR_NTLMSSP NDR_NTPRINTING NDR_DFSBLOBS NDR_DNSP
-
-NDR_TABLE_OBJ_FILES = ../librpc/ndr/ndr_table.o $(gen_ndrsrcdir)/tables.o
-
-[SUBSYSTEM::RPC_NDR_XATTR]
-PUBLIC_DEPENDENCIES = NDR_XATTR dcerpc
-
-RPC_NDR_XATTR_OBJ_FILES = ../librpc/gen_ndr/ndr_xattr_c.o
-
-[SUBSYSTEM::RPC_NDR_ROT]
-PUBLIC_DEPENDENCIES = NDR_ROT dcerpc
-
-RPC_NDR_ROT_OBJ_FILES = ../librpc/gen_ndr/ndr_rot_c.o
-
-[SUBSYSTEM::RPC_NDR_AUDIOSRV]
-PUBLIC_DEPENDENCIES = NDR_AUDIOSRV dcerpc
-
-RPC_NDR_AUDIOSRV_OBJ_FILES = ../librpc/gen_ndr/ndr_audiosrv_c.o
-
-[SUBSYSTEM::RPC_NDR_ECHO]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_ECHO_OBJ_FILES = ../librpc/gen_ndr/ndr_echo_c.o
-
-[SUBSYSTEM::RPC_NDR_DSBACKUP]
-PUBLIC_DEPENDENCIES = dcerpc NDR_DSBACKUP
-
-RPC_NDR_DSBACKUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dsbackup_c.o
-
-[SUBSYSTEM::RPC_NDR_EFS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_EFS
-
-RPC_NDR_EFS_OBJ_FILES = ../librpc/gen_ndr/ndr_efs_c.o
-
-[SUBSYSTEM::RPC_NDR_LSA]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_LSA_OBJ_FILES = ../librpc/gen_ndr/ndr_lsa_c.o
-
-[SUBSYSTEM::RPC_NDR_DFS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_DFS_OBJ_FILES = ../librpc/gen_ndr/ndr_dfs_c.o
-
-[SUBSYSTEM::RPC_NDR_FRSAPI]
-PUBLIC_DEPENDENCIES = dcerpc NDR_FRSAPI
-
-RPC_NDR_FRSAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_frsapi_c.o
-
-[SUBSYSTEM::RPC_NDR_DRSUAPI]
-PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI
-
-RPC_NDR_DRSUAPI_OBJ_FILES = ../librpc/gen_ndr/ndr_drsuapi_c.o
-
-[SUBSYSTEM::RPC_NDR_DRSBLOBS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_DRSBLOBS
-
-RPC_NDR_DRSBLOBS_OBJ_FILES = ../librpc/gen_ndr/ndr_drsblobs_c.o
-
-[SUBSYSTEM::RPC_NDR_POLICYAGENT]
-PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT
-
-RPC_NDR_POLICYAGENT_OBJ_FILES = ../librpc/gen_ndr/ndr_policyagent_c.o
-
-[SUBSYSTEM::RPC_NDR_UNIXINFO]
-PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
-
-RPC_NDR_UNIXINFO_OBJ_FILES = ../librpc/gen_ndr/ndr_unixinfo_c.o
-
-[SUBSYSTEM::RPC_NDR_BROWSER]
-PUBLIC_DEPENDENCIES = dcerpc NDR_BROWSER
-
-RPC_NDR_BROWSER_OBJ_FILES = ../librpc/gen_ndr/ndr_browser_c.o
-
-[SUBSYSTEM::RPC_NDR_IRPC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_IRPC
-
-RPC_NDR_IRPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_irpc_c.o
-
-[LIBRARY::dcerpc_samr]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-PC_FILES += $(librpcsrcdir)/dcerpc_samr.pc
-
-dcerpc_samr_VERSION = 0.0.1
-dcerpc_samr_SOVERSION = 0
-dcerpc_samr_OBJ_FILES = ../librpc/gen_ndr/ndr_samr_c.o
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_samr_c.h
-
-[SUBSYSTEM::RPC_NDR_SPOOLSS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS
-
-RPC_NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss_c.o
-
-[SUBSYSTEM::RPC_NDR_WKSSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_WKSSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wkssvc_c.o
-
-[SUBSYSTEM::RPC_NDR_SRVSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC
-
-RPC_NDR_SRVSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_srvsvc_c.o
-
-[SUBSYSTEM::RPC_NDR_SVCCTL]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl_c.o
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_svcctl_c.h
-
-[LIBRARY::dcerpc_atsvc]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-dcerpc_atsvc_VERSION = 0.0.1
-dcerpc_atsvc_SOVERSION = 0
-
-dcerpc_atsvc_OBJ_FILES = ../librpc/gen_ndr/ndr_atsvc_c.o
-PC_FILES += $(librpcsrcdir)/dcerpc_atsvc.pc
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_atsvc_c.h
-
-[SUBSYSTEM::RPC_NDR_EVENTLOG]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_EVENTLOG_OBJ_FILES = ../librpc/gen_ndr/ndr_eventlog_c.o
-
-[SUBSYSTEM::RPC_NDR_EPMAPPER]
-PUBLIC_DEPENDENCIES = LIBTEVENT NDR_EPMAPPER
-
-RPC_NDR_EPMAPPER_OBJ_FILES = ../librpc/gen_ndr/ndr_epmapper_c.o
-
-[SUBSYSTEM::RPC_NDR_DBGIDL]
-PUBLIC_DEPENDENCIES = dcerpc NDR_DBGIDL
-
-RPC_NDR_DBGIDL_OBJ_FILES = ../librpc/gen_ndr/ndr_dbgidl_c.o
-
-[SUBSYSTEM::RPC_NDR_DSSETUP]
-PUBLIC_DEPENDENCIES = dcerpc NDR_DSSETUP
-
-RPC_NDR_DSSETUP_OBJ_FILES = ../librpc/gen_ndr/ndr_dssetup_c.o
-
-[SUBSYSTEM::RPC_NDR_MSGSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_MSGSVC
-
-RPC_NDR_MSGSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_msgsvc_c.o
-
-[SUBSYSTEM::RPC_NDR_WINSIF]
-PUBLIC_DEPENDENCIES = dcerpc NDR_WINSIF
-
-RPC_NDR_WINSIF_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winsif_c.o
-
-[SUBSYSTEM::RPC_NDR_WINREG]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_WINREG_OBJ_FILES = ../librpc/gen_ndr/ndr_winreg_c.o
-
-[SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_INITSHUTDOWN_OBJ_FILES = ../librpc/gen_ndr/ndr_initshutdown_c.o
-
-[SUBSYSTEM::RPC_NDR_MGMT]
-PRIVATE_DEPENDENCIES = LIBTEVENT NDR_MGMT
-
-RPC_NDR_MGMT_OBJ_FILES = ../librpc/gen_ndr/ndr_mgmt_c.o
-
-[SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
-PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE
-
-RPC_NDR_PROTECTED_STORAGE_OBJ_FILES = ../librpc/gen_ndr/ndr_protected_storage_c.o
-
-[SUBSYSTEM::RPC_NDR_OXIDRESOLVER]
-PUBLIC_DEPENDENCIES = dcerpc NDR_OXIDRESOLVER
-
-RPC_NDR_OXIDRESOLVER_OBJ_FILES = ../librpc/gen_ndr/ndr_oxidresolver_c.o
-
-[SUBSYSTEM::RPC_NDR_REMACT]
-PUBLIC_DEPENDENCIES = dcerpc NDR_REMACT
-
-RPC_NDR_REMACT_OBJ_FILES = ../librpc/gen_ndr/ndr_remact_c.o
-
-[SUBSYSTEM::RPC_NDR_WZCSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_WZCSVC
-
-RPC_NDR_WZCSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wzcsvc_c.o
-
-[SUBSYSTEM::RPC_NDR_W32TIME]
-PUBLIC_DEPENDENCIES = dcerpc NDR_W32TIME
-
-RPC_NDR_W32TIME_OBJ_FILES = ../librpc/gen_ndr/ndr_w32time_c.o
-
-[SUBSYSTEM::RPC_NDR_SCERPC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC
-
-RPC_NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc_c.o
-
-[SUBSYSTEM::RPC_NDR_NTSVCS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
-
-RPC_NDR_NTSVCS_OBJ_FILES = ../librpc/gen_ndr/ndr_ntsvcs_c.o
-
-[SUBSYSTEM::RPC_NDR_NETLOGON]
-PUBLIC_DEPENDENCIES = LIBTEVENT NDR_STANDARD
-
-RPC_NDR_NETLOGON_OBJ_FILES = ../librpc/gen_ndr/ndr_netlogon_c.o
-
-[SUBSYSTEM::RPC_NDR_TRKWKS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_TRKWKS
-
-RPC_NDR_TRKWKS_OBJ_FILES = ../librpc/gen_ndr/ndr_trkwks_c.o
-
-[SUBSYSTEM::RPC_NDR_KEYSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC
-
-RPC_NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc_c.o
-
-[SUBSYSTEM::NDR_RAP]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_RAP_OBJ_FILES = ../librpc/gen_ndr/ndr_rap.o ../librpc/ndr/ndr_rap.o
-
-[SUBSYSTEM::NDR_DCERPC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_DCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_dcerpc.o
-
-PUBLIC_HEADERS += ../librpc/gen_ndr/dcerpc.h ../librpc/gen_ndr/ndr_dcerpc.h
-
-################################################
-# Start SUBSYSTEM dcerpc
-[LIBRARY::dcerpc]
-PRIVATE_DEPENDENCIES = \
-		samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-		LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
-		NDR_SCHANNEL RPC_NDR_NETLOGON \
-		RPC_NDR_MGMT \
-		gensec LIBCLI_AUTH LIBCLI_RAW \
-		LP_RESOLVE UTIL_TEVENT
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBTEVENT LIBTALLOC
-# End SUBSYSTEM dcerpc
-################################################
-
-PC_FILES += $(librpcsrcdir)/dcerpc.pc
-dcerpc_VERSION = 0.0.1
-dcerpc_SOVERSION = 0
-
-dcerpc_OBJ_FILES = $(addprefix $(dcerpcsrcdir)/, dcerpc.o dcerpc_auth.o dcerpc_schannel.o dcerpc_util.o \
-				  dcerpc_smb.o dcerpc_smb2.o dcerpc_sock.o dcerpc_connect.o dcerpc_secondary.o) \
-					../librpc/rpc/binding.o ../librpc/rpc/dcerpc_error.o
-
-$(eval $(call proto_header_template,$(dcerpcsrcdir)/dcerpc_proto.h,$(dcerpc_OBJ_FILES:.o=.c)))
-
-
-PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, rpc/dcerpc.h) \
-			$(addprefix ../librpc/gen_ndr/, mgmt.h ndr_mgmt.h ndr_mgmt_c.h \
-			epmapper.h ndr_epmapper.h ndr_epmapper_c.h)
-
-
-[PYTHON::python_dcerpc]
-LIBRARY_REALNAME = samba/dcerpc/base.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_SMB LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG pycredentials pyparam_util
-
-python_dcerpc_OBJ_FILES = $(dcerpcsrcdir)/pyrpc.o
-
-$(eval $(call python_py_module_template,samba/dcerpc/__init__.py,$(dcerpcsrcdir)/dcerpc.py))
-
-
-[PYTHON::python_echo]
-LIBRARY_REALNAME = samba/dcerpc/echo.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_ECHO PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_echo_OBJ_FILES = ../librpc/gen_ndr/py_echo.o
-
-[PYTHON::python_winreg]
-LIBRARY_REALNAME = samba/dcerpc/winreg.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_WINREG PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_winreg_OBJ_FILES = ../librpc/gen_ndr/py_winreg.o
-
-[PYTHON::python_dcerpc_misc]
-LIBRARY_REALNAME = samba/dcerpc/misc.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc NDR_MISC NDR_KRB5PAC
-
-python_dcerpc_misc_OBJ_FILES = ../librpc/gen_ndr/py_misc.o
-
-[PYTHON::python_initshutdown]
-LIBRARY_REALNAME = samba/dcerpc/initshutdown.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_INITSHUTDOWN PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_initshutdown_OBJ_FILES = ../librpc/gen_ndr/py_initshutdown.o
-
-[PYTHON::python_epmapper]
-LIBRARY_REALNAME = samba/dcerpc/epmapper.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES =  dcerpc PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_epmapper_OBJ_FILES = ../librpc/gen_ndr/py_epmapper.o
-
-[PYTHON::python_mgmt]
-LIBRARY_REALNAME = samba/dcerpc/mgmt.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = PYTALLOC param pycredentials dcerpc python_dcerpc
-
-python_mgmt_OBJ_FILES = ../librpc/gen_ndr/py_mgmt.o
-
-[PYTHON::python_atsvc]
-LIBRARY_REALNAME = samba/dcerpc/atsvc.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = dcerpc_atsvc PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_atsvc_OBJ_FILES = ../librpc/gen_ndr/py_atsvc.o
-
-[PYTHON::python_dcerpc_nbt]
-LIBRARY_REALNAME = samba/dcerpc/nbt.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_dcerpc_nbt_OBJ_FILES = ../librpc/gen_ndr/py_nbt.o
-
-[PYTHON::python_samr]
-LIBRARY_REALNAME = samba/dcerpc/samr.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = dcerpc_samr PYTALLOC pycredentials pyparam_util python_dcerpc
-
-python_samr_OBJ_FILES = ../librpc/gen_ndr/py_samr.o
-
-[PYTHON::python_svcctl]
-LIBRARY_REALNAME = samba/dcerpc/svcctl.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_SVCCTL PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_svcctl_OBJ_FILES = ../librpc/gen_ndr/py_svcctl.o
-
-[PYTHON::python_lsa]
-LIBRARY_REALNAME = samba/dcerpc/lsa.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_LSA PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_lsa_OBJ_FILES = ../librpc/gen_ndr/py_lsa.o
-
-[PYTHON::python_wkssvc]
-LIBRARY_REALNAME = samba/dcerpc/wkssvc.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_WKSSVC PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_wkssvc_OBJ_FILES = ../librpc/gen_ndr/py_wkssvc.o
-
-[PYTHON::python_dfs]
-LIBRARY_REALNAME = samba/dcerpc/dfs.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_DFS PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_dfs_OBJ_FILES = ../librpc/gen_ndr/py_dfs.o
-
-[PYTHON::python_unixinfo]
-LIBRARY_REALNAME = samba/dcerpc/unixinfo.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_unixinfo_OBJ_FILES = ../librpc/gen_ndr/py_unixinfo.o
-
-[PYTHON::python_irpc]
-LIBRARY_REALNAME = samba/dcerpc/irpc.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_IRPC PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_irpc_OBJ_FILES = $(gen_ndrsrcdir)/py_irpc.o
-
-[PYTHON::python_drsuapi]
-LIBRARY_REALNAME = samba/dcerpc/drsuapi.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_drsuapi_OBJ_FILES = ../librpc/gen_ndr/py_drsuapi.o
-
-[PYTHON::python_drsblobs]
-LIBRARY_REALNAME = samba/dcerpc/drsblobs.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_DRSBLOBS PYTALLOC pyparam_util pycredentials python_dcerpc
-
-python_drsblobs_OBJ_FILES = ../librpc/gen_ndr/py_drsblobs.o
-
-[PYTHON::python_dcerpc_security]
-LIBRARY_REALNAME = samba/dcerpc/security.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc NDR_SECURITY
-
-python_dcerpc_security_OBJ_FILES = ../librpc/gen_ndr/py_security.o
-
-[PYTHON::python_dcerpc_xattr]
-LIBRARY_REALNAME = samba/dcerpc/xattr.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc python_dcerpc_security NDR_XATTR RPC_NDR_XATTR
-
-python_dcerpc_xattr_OBJ_FILES = ../librpc/gen_ndr/py_xattr.o
-
-$(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
-	$(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
-	$(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
-	$(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
-
-idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 
-	@PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" srcdir="$(srcdir)" PIDL="$(PIDL)" ../librpc/build_idl.sh --full ../librpc/idl/*.idl
-	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
-
-idl:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 
-	@PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" srcdir="$(srcdir)" PIDL="$(PIDL)" ../librpc/build_idl.sh ../librpc/idl/*.idl
-	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
-
-clean::
-	@echo "Remove ../librpc/gen_ndr files which are not commited to git"
-	@cat ../.gitignore | grep "^librpc/gen_ndr" | xargs rm -f
diff --git a/source4/main.mk b/source4/main.mk
deleted file mode 100644
index d57fad3854..0000000000
--- a/source4/main.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-mkinclude dynconfig/config.mk
-mkinclude config.mk
-mkinclude dsdb/config.mk
-mkinclude smbd/config.mk
-mkinclude cluster/config.mk
-mkinclude smbd/process_model.mk
-mkinclude libnet/config.mk
-mkinclude auth/config.mk
-mkinclude ../nsswitch/config.mk
-mkinclude ../nsswitch/libwbclient/config.mk
-mkinclude lib/samba3/config.mk
-mkinclude lib/socket/config.mk
-mkinclude ../lib/util/charset/config.mk
-mkinclude lib/ldb-samba/config.mk
-mkinclude lib/tls/config.mk
-mkinclude lib/registry/config.mk
-mkinclude lib/messaging/config.mk
-mkinclude lib/events/config.mk
-mkinclude lib/cmdline/config.mk
-mkinclude ../lib/socket_wrapper/config.mk
-mkinclude ../lib/nss_wrapper/config.mk
-mkinclude ../lib/uid_wrapper/config.mk
-mkinclude lib/stream/config.mk
-mkinclude ../lib/util/config.mk
-mkinclude ../lib/tdr/config.mk
-mkinclude ../lib/tsocket/config.mk
-mkinclude ../lib/crypto/config.mk
-mkinclude ../lib/torture/config.mk
-mkinclude lib/basic.mk
-mkinclude lib/com/config.mk
-# WMI fails at the moment
-# mkinclude lib/wmi/config.mk
-mkinclude param/config.mk
-mkinclude smb_server/config.mk
-mkinclude rpc_server/config.mk
-mkinclude ldap_server/config.mk
-mkinclude web_server/config.mk
-mkinclude winbind/config.mk
-mkinclude nbt_server/config.mk
-mkinclude wrepl_server/config.mk
-mkinclude cldap_server/config.mk
-mkinclude ntp_signd/config.mk
-mkinclude utils/net/config.mk
-mkinclude utils/config.mk
-mkinclude ntvfs/config.mk
-mkinclude ntptr/config.mk
-mkinclude torture/config.mk
-mkinclude librpc/config.mk
-mkinclude client/config.mk
-mkinclude libcli/config.mk
-mkinclude ../libcli/smb/config.mk
-mkinclude ../libcli/cldap/config.mk
-mkinclude scripting/python/config.mk
-mkinclude kdc/config.mk
-mkinclude ../lib/smbconf/config.mk
-mkinclude ../lib/async_req/config.mk
-mkinclude ../libcli/security/config.mk
-mkinclude ../libcli/ldap/config.mk
-mkinclude ../libcli/nbt/config.mk
-mkinclude ../libcli/auth/config.mk
-mkinclude ../libcli/drsuapi/config.mk
-mkinclude ../libcli/samsync/config.mk
-mkinclude lib/policy/config.mk
-mkinclude ../libcli/named_pipe_auth/config.mk
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
deleted file mode 100644
index b310133786..0000000000
--- a/source4/min_versions.m4
+++ /dev/null
@@ -1,6 +0,0 @@
-# Minimum and exact required versions for various libraries 
-# if we use the ones installed in the system.
-define(TDB_MIN_VERSION,1.2.1)
-define(TALLOC_MIN_VERSION,2.0.3)
-define(LDB_REQUIRED_VERSION,0.9.10)
-define(TEVENT_REQUIRED_VERSION,0.9.9)
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
deleted file mode 100644
index ba5531da7e..0000000000
--- a/source4/nbt_server/config.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-# NBTD server subsystem
-
-#######################
-# Start SUBSYSTEM WINSDB
-[SUBSYSTEM::WINSDB]
-PUBLIC_DEPENDENCIES = \
-		LIBLDB
-# End SUBSYSTEM WINSDB
-#######################
-
-WINSDB_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/wins/, winsdb.o wins_hook.o)
-
-$(eval $(call proto_header_template,$(nbt_serversrcdir)/wins/winsdb_proto.h,$(WINSDB_OBJ_FILES:.o=.c)))
-
-#######################
-# Start MODULE ldb_wins_ldb
-[MODULE::ldb_wins_ldb]
-SUBSYSTEM = LIBLDB
-INIT_FUNCTION = LDB_MODULE(wins_ldb)
-PRIVATE_DEPENDENCIES = \
-		LIBLDB LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL
-# End MODULE ldb_wins_ldb
-#######################
-
-ldb_wins_ldb_OBJ_FILES = $(nbt_serversrcdir)/wins/wins_ldb.o
-
-#######################
-# Start SUBSYSTEM NBTD_WINS
-[SUBSYSTEM::NBTD_WINS]
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_NBT WINSDB
-# End SUBSYSTEM NBTD_WINS
-#######################
-
-
-NBTD_WINS_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/wins/, winsserver.o winsclient.o winswack.o wins_dns_proxy.o)
-
-$(eval $(call proto_header_template,$(nbt_serversrcdir)/wins/winsserver_proto.h,$(NBTD_WINS_OBJ_FILES:.o=.c)))
-
-#######################
-# Start SUBSYSTEM NBTD_DGRAM
-[SUBSYSTEM::NBTD_DGRAM]
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_DGRAM CLDAPD
-# End SUBSYSTEM NBTD_DGRAM
-#######################
-
-NBTD_DGRAM_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/dgram/, request.o netlogon.o browse.o)
-
-$(eval $(call proto_header_template,$(nbt_serversrcdir)/dgram/proto.h,$(NBTD_DGRAM_OBJ_FILES:.o=.c)))
-
-#######################
-# Start SUBSYSTEM NBTD
-[SUBSYSTEM::NBT_SERVER]
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_NBT NBTD_WINS NBTD_DGRAM 
-# End SUBSYSTEM NBTD
-#######################
-
-NBT_SERVER_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/, \
-		interfaces.o \
-		register.o \
-		query.o \
-		nodestatus.o \
-		defense.o \
-		packet.o \
-		irpc.o)
-
-$(eval $(call proto_header_template,$(nbt_serversrcdir)/nbt_server_proto.h,$(NBT_SERVER_OBJ_FILES:.o=.c)))
-
-[MODULE::service_nbtd]
-INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = NBT_SERVER process_model
-
-service_nbtd_OBJ_FILES = \
-		$(nbt_serversrcdir)/nbt_server.o
diff --git a/source4/ntp_signd/config.mk b/source4/ntp_signd/config.mk
deleted file mode 100644
index dd263fc88f..0000000000
--- a/source4/ntp_signd/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# NTP_SIGND server subsystem
-
-#######################
-# Start SUBSYSTEM NTP_signd
-[MODULE::NTP_SIGND]
-INIT_FUNCTION = server_service_ntp_signd_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		SAMDB NDR_NTP_SIGND \
-		LIBTSOCKET LIBSAMBA_TSOCKET
-# End SUBSYSTEM NTP_SIGND
-#######################
-
-NTP_SIGND_OBJ_FILES = $(addprefix $(ntp_signdsrcdir)/, ntp_signd.o)
-
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
deleted file mode 100644
index 71b3bc05a8..0000000000
--- a/source4/ntptr/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# ntptr server subsystem
-
-################################################
-# Start MODULE ntptr_simple_ldb
-[MODULE::ntptr_simple_ldb]
-INIT_FUNCTION = ntptr_simple_ldb_init
-SUBSYSTEM = ntptr
-PRIVATE_DEPENDENCIES = \
-		LIBLDB NDR_SPOOLSS DCERPC_COMMON
-# End MODULE ntptr_simple_ldb
-################################################
-
-ntptr_simple_ldb_OBJ_FILES = $(ntptrsrcdir)/simple_ldb/ntptr_simple_ldb.o
-
-################################################
-# Start SUBSYSTEM ntptr
-[SUBSYSTEM::ntptr]
-PUBLIC_DEPENDENCIES = DCERPC_COMMON
-#
-# End SUBSYSTEM ntptr
-################################################
-
-ntptr_OBJ_FILES = \
-		$(ntptrsrcdir)/ntptr_base.o \
-		$(ntptrsrcdir)/ntptr_interface.o
-
-$(eval $(call proto_header_template,$(ntptrsrcdir)/ntptr_proto.h,$(ntptr_OBJ_FILES:.o=.c)))
diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk
deleted file mode 100644
index a6957ace2f..0000000000
--- a/source4/ntvfs/common/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################
-# Start LIBRARY ntvfs_common
-[SUBSYSTEM::ntvfs_common]
-PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share
-# End LIBRARY ntvfs_common
-################################################
-
-ntvfs_common_OBJ_FILES = $(addprefix $(ntvfssrcdir)/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/common/proto.h,$(ntvfs_common_OBJ_FILES:.o=.c)))
-
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
deleted file mode 100644
index 060ee19115..0000000000
--- a/source4/ntvfs/config.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-# NTVFS Server subsystem
-mkinclude posix/config.mk
-mkinclude common/config.mk
-mkinclude unixuid/config.mk
-mkinclude sysdep/config.mk
-
-################################################
-# Start MODULE ntvfs_cifs
-[MODULE::ntvfs_cifs]
-INIT_FUNCTION = ntvfs_cifs_init 
-SUBSYSTEM = ntvfs
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_RAW
-# End MODULE ntvfs_cifs
-################################################
-
-ntvfs_cifs_OBJ_FILES = $(ntvfssrcdir)/cifs/vfs_cifs.o
-
-
-################################################
-# Start MODULE ntvfs_smb2
-[MODULE::ntvfs_smb2]
-INIT_FUNCTION = ntvfs_smb2_init
-SUBSYSTEM = ntvfs
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_RAW
-# End MODULE ntvfs_smb2
-################################################
-
-ntvfs_smb2_OBJ_FILES = $(ntvfssrcdir)/smb2/vfs_smb2.o
-
-
-################################################
-# Start MODULE ntvfs_simple
-[MODULE::ntvfs_simple]
-INIT_FUNCTION = ntvfs_simple_init 
-SUBSYSTEM = ntvfs 
-# End MODULE ntvfs_simple
-################################################
-
-ntvfs_simple_OBJ_FILES = $(addprefix $(ntvfssrcdir)/simple/, vfs_simple.o svfs_util.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/simple/proto.h,$(ntvfs_simple_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE ntvfs_cifsposix
-[MODULE::ntvfs_cifsposix]
-#ENABLE = NO
-INIT_FUNCTION = ntvfs_cifs_posix_init
-SUBSYSTEM = ntvfs
-# End MODULE ntvfs_cifsposix
-################################################
-
-ntvfs_cifsposix_OBJ_FILES = \
-	$(addprefix $(ntvfssrcdir)/cifs_posix_cli/, vfs_cifs_posix.o svfs_util.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/cifs_posix_cli/proto.h,$(ntvfs_cifsposix_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE ntvfs_print
-[MODULE::ntvfs_print]
-INIT_FUNCTION = ntvfs_print_init 
-SUBSYSTEM = ntvfs 
-# End MODULE ntvfs_print
-################################################
-
-ntvfs_print_OBJ_FILES = $(ntvfssrcdir)/print/vfs_print.o
-
-################################################
-# Start MODULE ntvfs_ipc
-[MODULE::ntvfs_ipc]
-SUBSYSTEM = ntvfs
-INIT_FUNCTION = ntvfs_ipc_init 
-PRIVATE_DEPENDENCIES = \
-		NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM \
-		HEIMDAL_GSSAPI CREDENTIALS
-# End MODULE ntvfs_ipc
-################################################
-
-ntvfs_ipc_OBJ_FILES = $(addprefix $(ntvfssrcdir)/ipc/, vfs_ipc.o ipc_rap.o rap_server.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/ipc/proto.h,$(ntvfs_ipc_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE ntvfs_nbench
-[MODULE::ntvfs_nbench]
-SUBSYSTEM = ntvfs
-INIT_FUNCTION = ntvfs_nbench_init 
-# End MODULE ntvfs_nbench
-################################################
-
-ntvfs_nbench_OBJ_FILES = $(ntvfssrcdir)/nbench/vfs_nbench.o
-
-################################################
-# Start SUBSYSTEM NTVFS
-[SUBSYSTEM::ntvfs]
-
-ntvfs_OBJ_FILES = $(addprefix $(ntvfssrcdir)/, ntvfs_base.o ntvfs_generic.o ntvfs_interface.o ntvfs_util.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/ntvfs_proto.h,$(ntvfs_OBJ_FILES:.o=.c)))
-
-# PUBLIC_HEADERS += $(ntvfssrcdir)/ntvfs.h
-#
-# End SUBSYSTEM NTVFS
-################################################
diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4
deleted file mode 100644
index a6f79dfbb3..0000000000
--- a/source4/ntvfs/posix/config.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-dnl #############################################
-dnl see if we have nanosecond resolution for stat
-AC_CACHE_CHECK([for tv_nsec nanosecond fields in struct stat],ac_cv_have_stat_tv_nsec,[
-AC_TRY_COMPILE(
-[
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-],
-[struct stat st; 
- st.st_mtim.tv_nsec;
- st.st_atim.tv_nsec;
- st.st_ctim.tv_nsec;
-],
-ac_cv_decl_have_stat_tv_nsec=yes,
-ac_cv_decl_have_stat_tv_nsec=no)
-])
-if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
-   AC_DEFINE(HAVE_STAT_TV_NSEC,1,[Whether stat has tv_nsec nanosecond fields])
-fi
-
-AC_CHECK_HEADERS(blkid/blkid.h)
-AC_SEARCH_LIBS_EXT(blkid_get_cache, [blkid], BLKID_LIBS)
-AC_CHECK_FUNC_EXT(blkid_get_cache, $BLKID_LIBS)
-SMB_EXT_LIB(BLKID,[${BLKID_LIBS}],[${BLKID_CFLAGS}],[${BLKID_CPPFLAGS}],[${BLKID_LDFLAGS}])
-if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
-	AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)])
-	SMB_ENABLE(BLKID,YES)
-fi
-
-SMB_ENABLE(pvfs_aio,NO)
-if test x"$tevent_cv_aio_support" = x"yes"; then
-	SMB_ENABLE(pvfs_aio,YES)
-fi
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
deleted file mode 100644
index cf4398b91d..0000000000
--- a/source4/ntvfs/posix/config.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-
-[SUBSYSTEM::pvfs_acl]
-
-pvfs_acl_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl.o
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_acl_proto.h,$(pvfs_acl_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE pvfs_acl_xattr
-[MODULE::pvfs_acl_xattr]
-INIT_FUNCTION = pvfs_acl_xattr_init 
-SUBSYSTEM = pvfs_acl
-PRIVATE_DEPENDENCIES = NDR_XATTR
-# End MODULE pvfs_acl_xattr
-################################################
-
-pvfs_acl_xattr_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_xattr.o
-
-################################################
-# Start MODULE pvfs_acl_nfs4
-[MODULE::pvfs_acl_nfs4]
-INIT_FUNCTION = pvfs_acl_nfs4_init 
-SUBSYSTEM = pvfs_acl
-PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB
-# End MODULE pvfs_acl_nfs4
-################################################
-
-pvfs_acl_nfs4_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_nfs4.o
-
-################################################
-[SUBSYSTEM::pvfs_aio]
-PRIVATE_DEPENDENCIES = LIBTEVENT LIBTEVENT_EXT
-################################################
-
-pvfs_aio_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_aio.o
-
-################################################
-# Start MODULE ntvfs_posix
-[MODULE::ntvfs_posix]
-SUBSYSTEM = ntvfs
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = ntvfs_posix_init 
-#PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4
-PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING \
-			LIBWBCLIENT_OLD pvfs_acl pvfs_aio
-# End MODULE ntvfs_posix
-################################################
-
-ntvfs_posix_OBJ_FILES = $(addprefix $(ntvfssrcdir)/posix/, \
-		vfs_posix.o \
-		pvfs_util.o \
-		pvfs_search.o \
-		pvfs_dirlist.o \
-		pvfs_fileinfo.o \
-		pvfs_unlink.o \
-		pvfs_mkdir.o \
-		pvfs_open.o \
-		pvfs_read.o \
-		pvfs_flush.o \
-		pvfs_write.o \
-		pvfs_fsinfo.o \
-		pvfs_qfileinfo.o \
-		pvfs_setfileinfo.o \
-		pvfs_rename.o \
-		pvfs_resolve.o \
-		pvfs_shortname.o \
-		pvfs_lock.o \
-		pvfs_oplock.o \
-		pvfs_wait.o \
-		pvfs_seek.o \
-		pvfs_ioctl.o \
-		pvfs_xattr.o \
-		pvfs_streams.o \
-		pvfs_notify.o \
-		pvfs_sys.o \
-		xattr_system.o \
-		xattr_tdb.o)
-
-$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_posix_proto.h,$(ntvfs_posix_OBJ_FILES:.o=.c)))
-
-[PYTHON::python_xattr_native]
-LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR
-
-python_xattr_native_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_native.o
-
-[PYTHON::python_xattr_tdb]
-LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share
-
-python_xattr_tdb_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o
diff --git a/source4/ntvfs/sysdep/config.m4 b/source4/ntvfs/sysdep/config.m4
deleted file mode 100644
index f54f65d08d..0000000000
--- a/source4/ntvfs/sysdep/config.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h sys/inotify.h)
-AC_CHECK_FUNC(inotify_init)
-AC_HAVE_DECL(__NR_inotify_init, [#include <asm/unistd.h>])
-
-SMB_ENABLE(sys_notify_inotify, NO)
-
-if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_sys_inotify_h" = x"yes"; then
-    SMB_ENABLE(sys_notify_inotify, YES)
-fi
-
-if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then
-    SMB_ENABLE(sys_notify_inotify, YES)
-fi
-
-if test x"$ac_cv_header_linux_inotify_h" = x"yes" -a x"$ac_cv_have___NR_inotify_init_decl" = x"yes"; then
-    SMB_ENABLE(sys_notify_inotify, YES)
-fi
-
-AC_HAVE_DECL(F_SETLEASE, [#include <fcntl.h>])
-AC_HAVE_DECL(SA_SIGINFO, [#include <signal.h>])
-
-SMB_ENABLE(sys_lease_linux, NO)
-
-if test x"$ac_cv_have_F_SETLEASE_decl" = x"yes" \
-	-a x"$ac_cv_have_SA_SIGINFO_decl" = x"yes"; then
-    SMB_ENABLE(sys_lease_linux, YES)
-fi
diff --git a/source4/ntvfs/sysdep/config.mk b/source4/ntvfs/sysdep/config.mk
deleted file mode 100644
index 5feca6143a..0000000000
--- a/source4/ntvfs/sysdep/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################
-# Start MODULE sys_notify_inotify
-[MODULE::sys_notify_inotify]
-SUBSYSTEM = sys_notify
-INIT_FUNCTION = sys_notify_inotify_init
-PRIVATE_DEPENDENCIES = LIBEVENTS
-# End MODULE sys_notify_inotify
-################################################
-
-sys_notify_inotify_OBJ_FILES = $(ntvfssrcdir)/sysdep/inotify.o
-
-################################################
-# Start SUBSYSTEM sys_notify
-[SUBSYSTEM::sys_notify]
-# End SUBSYSTEM sys_notify
-################################################
-
-sys_notify_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_notify.o
-
-[SUBSYSTEM::sys_lease_linux]
-PRIVATE_DEPENDENCIES = LIBTEVENT
-
-sys_lease_linux_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_lease_linux.o
-
-[SUBSYSTEM::sys_lease]
-
-sys_lease_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_lease.o
diff --git a/source4/ntvfs/unixuid/config.m4 b/source4/ntvfs/unixuid/config.m4
deleted file mode 100644
index cb870d9e16..0000000000
--- a/source4/ntvfs/unixuid/config.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(setgroups)
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
deleted file mode 100644
index 105ba2f535..0000000000
--- a/source4/ntvfs/unixuid/config.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################
-# Start MODULE ntvfs_unixuid
-[MODULE::ntvfs_unixuid]
-INIT_FUNCTION = ntvfs_unixuid_init
-SUBSYSTEM = ntvfs
-PRIVATE_DEPENDENCIES = SAMDB NSS_WRAPPER UID_WRAPPER
-# End MODULE ntvfs_unixuid
-################################################
-
-ntvfs_unixuid_OBJ_FILES = $(ntvfssrcdir)/unixuid/vfs_unixuid.o
diff --git a/source4/param/config.mk b/source4/param/config.mk
deleted file mode 100644
index a5bcea691b..0000000000
--- a/source4/param/config.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-[LIBRARY::LIBSAMBA-HOSTCONFIG]
-PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
-PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
-
-LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
-LIBSAMBA-HOSTCONFIG_SOVERSION = 0
-
-LIBSAMBA-HOSTCONFIG_OBJ_FILES = $(addprefix $(paramsrcdir)/,  \
-			loadparm.o generic.o util.o) 
-
-PUBLIC_HEADERS += param/param.h
-
-PC_FILES += $(paramsrcdir)/samba-hostconfig.pc
-
-[SUBSYSTEM::PROVISION]
-PRIVATE_DEPENDENCIES = LIBPYTHON pyparam_util LIBLDB
-
-PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o $(param_OBJ_FILES)
-
-#################################
-# Start SUBSYSTEM share
-[SUBSYSTEM::share]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-# End SUBSYSTEM share
-#################################
-
-share_OBJ_FILES = $(paramsrcdir)/share.o
-
-$(eval $(call proto_header_template,$(paramsrcdir)/share_proto.h,$(share_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += param/share.h
-
-################################################
-# Start MODULE share_classic
-[MODULE::share_classic]
-SUBSYSTEM = share
-INIT_FUNCTION = share_classic_init
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-# End MODULE share_classic
-################################################
-
-share_classic_OBJ_FILES = $(paramsrcdir)/share_classic.o 
-
-################################################
-# Start MODULE share_ldb
-[MODULE::share_ldb]
-SUBSYSTEM = share
-INIT_FUNCTION = share_ldb_init
-PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
-# End MODULE share_ldb
-################################################
-
-share_ldb_OBJ_FILES = $(paramsrcdir)/share_ldb.o 
-
-[SUBSYSTEM::SECRETS]
-PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
-
-SECRETS_OBJ_FILES = $(paramsrcdir)/secrets.o
-
-[PYTHON::param]
-LIBRARY_REALNAME = samba/param.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG PYTALLOC
-
-param_OBJ_FILES = $(paramsrcdir)/pyparam.o
-
-[SUBSYSTEM::pyparam_util]
-PRIVATE_DEPENDENCIES = LIBPYTHON
-
-pyparam_util_OBJ_FILES = $(paramsrcdir)/pyparam_util.o
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
deleted file mode 100644
index 158c039223..0000000000
--- a/source4/rpc_server/config.mk
+++ /dev/null
@@ -1,250 +0,0 @@
-# DCERPC Server subsystem
-
-################################################
-# Start SUBSYSTEM DCERPC_COMMON
-[SUBSYSTEM::DCERPC_COMMON]
-PRIVATE_DEPENDENCIES = LIBLDB
-#
-# End SUBSYSTEM DCERPC_COMMON
-################################################
-
-DCERPC_COMMON_OBJ_FILES = $(addprefix $(rpc_serversrcdir)/common/, \
-	server_info.o share_info.o forward.o)
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/common/proto.h,$(DCERPC_COMMON_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += $(rpc_serversrcdir)/common/common.h
-
-################################################
-# Start MODULE dcerpc_rpcecho
-[MODULE::dcerpc_rpcecho]
-INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = NDR_STANDARD LIBEVENTS
-# End MODULE dcerpc_rpcecho
-################################################
-
-dcerpc_rpcecho_OBJ_FILES = $(rpc_serversrcdir)/echo/rpc_echo.o
-
-################################################
-# Start MODULE dcerpc_epmapper
-[MODULE::dcerpc_epmapper]
-INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = NDR_EPMAPPER
-# End MODULE dcerpc_epmapper
-################################################
-
-dcerpc_epmapper_OBJ_FILES = $(rpc_serversrcdir)/epmapper/rpc_epmapper.o
-
-################################################
-# Start MODULE dcerpc_remote
-[MODULE::dcerpc_remote]
-INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB NDR_TABLE
-# End MODULE dcerpc_remote
-################################################
-
-dcerpc_remote_OBJ_FILES = $(rpc_serversrcdir)/remote/dcesrv_remote.o
-
-################################################
-# Start MODULE dcerpc_srvsvc
-[MODULE::dcerpc_srvsvc]
-INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON NDR_SRVSVC share
-# End MODULE dcerpc_srvsvc
-################################################
-
-
-dcerpc_srvsvc_OBJ_FILES = $(addprefix $(rpc_serversrcdir)/srvsvc/, dcesrv_srvsvc.o srvsvc_ntvfs.o)
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/srvsvc/proto.h,$(dcerpc_srvsvc_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE dcerpc_wkssvc
-[MODULE::dcerpc_wkssvc]
-INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON NDR_STANDARD
-# End MODULE dcerpc_wkssvc
-################################################
-
-dcerpc_wkssvc_OBJ_FILES = $(rpc_serversrcdir)/wkssvc/dcesrv_wkssvc.o
-
-################################################
-# Start MODULE dcerpc_unixinfo
-[MODULE::dcerpc_unixinfo]
-INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON \
-		SAMDB \
-		NDR_UNIXINFO \
-		NSS_WRAPPER \
-		LIBWBCLIENT_OLD
-# End MODULE dcerpc_unixinfo
-################################################
-
-dcerpc_unixinfo_OBJ_FILES = $(rpc_serversrcdir)/unixinfo/dcesrv_unixinfo.o
-
-################################################
-# Start MODULE dcesrv_samr
-[MODULE::dcesrv_samr]
-INIT_FUNCTION = dcerpc_server_samr_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		DCERPC_COMMON \
-		NDR_STANDARD
-# End MODULE dcesrv_samr
-################################################
-
-dcesrv_samr_OBJ_FILES = $(addprefix $(rpc_serversrcdir)/samr/, dcesrv_samr.o samr_password.o)
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/samr/proto.h,$(dcesrv_samr_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE dcerpc_winreg
-[MODULE::dcerpc_winreg]
-INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = \
-		registry NDR_STANDARD
-# End MODULE dcerpc_winreg
-################################################
-
-dcerpc_winreg_OBJ_FILES = $(rpc_serversrcdir)/winreg/rpc_winreg.o
-
-################################################
-# Start MODULE dcerpc_netlogon
-[MODULE::dcerpc_netlogon]
-INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON \
-		SCHANNELDB \
-		NDR_STANDARD \
-		auth_sam \
-		LIBSAMBA-HOSTCONFIG
-# End MODULE dcerpc_netlogon
-################################################
-
-dcerpc_netlogon_OBJ_FILES = $(rpc_serversrcdir)/netlogon/dcerpc_netlogon.o
-
-################################################
-# Start MODULE dcerpc_lsa
-[MODULE::dcerpc_lsarpc]
-INIT_FUNCTION = dcerpc_server_lsa_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		DCERPC_COMMON \
-		NDR_STANDARD \
-		LIBCLI_AUTH \
-		NDR_DSSETUP
-# End MODULE dcerpc_lsa
-################################################
-
-dcerpc_lsarpc_OBJ_FILES = $(addprefix $(rpc_serversrcdir)/lsa/, dcesrv_lsa.o lsa_init.o lsa_lookup.o)
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/lsa/proto.h,$(dcerpc_lsarpc_OBJ_FILES:.o=.c)))
-
-
-################################################
-# Start MODULE dcerpc_spoolss
-[MODULE::dcerpc_spoolss]
-INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON \
-		NDR_SPOOLSS \
-		ntptr \
-		RPC_NDR_SPOOLSS
-# End MODULE dcerpc_spoolss
-################################################
-
-dcerpc_spoolss_OBJ_FILES = $(rpc_serversrcdir)/spoolss/dcesrv_spoolss.o
-
-################################################
-# Start MODULE dcerpc_drsuapi
-[MODULE::dcerpc_drsuapi]
-INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		SAMDB \
-		DCERPC_COMMON \
-		NDR_DRSUAPI
-# End MODULE dcerpc_drsuapi
-################################################
-
-dcerpc_drsuapi_OBJ_FILES = $(rpc_serversrcdir)/drsuapi/dcesrv_drsuapi.o \
-	$(rpc_serversrcdir)/drsuapi/updaterefs.o \
-	$(rpc_serversrcdir)/drsuapi/getncchanges.o \
-	$(rpc_serversrcdir)/drsuapi/addentry.o \
-	$(rpc_serversrcdir)/drsuapi/writespn.o \
-	$(rpc_serversrcdir)/drsuapi/drsutil.o
-
-################################################
-# Start MODULE dcerpc_browser
-[MODULE::dcerpc_browser]
-INIT_FUNCTION = dcerpc_server_browser_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		DCERPC_COMMON \
-		NDR_BROWSER
-# End MODULE dcerpc_browser
-################################################
-
-dcerpc_browser_OBJ_FILES = $(rpc_serversrcdir)/browser/dcesrv_browser.o
-
-################################################
-# Start MODULE dcerpc_eventlog6
-[MODULE::dcerpc_eventlog6]
-INIT_FUNCTION = dcerpc_server_eventlog6_init
-SUBSYSTEM = dcerpc_server
-PRIVATE_DEPENDENCIES = \
-		SAMDB	\
-		DCERPC_COMMON	\
-		NDR_DRSUAPI
-# End MODULE dcerpc_eventlog6
-################################################
-
-dcerpc_browser_OBJ_FILES = $(rpc_serversrcdir)/eventlog/dcesrv_eventlog6.o
-
-################################################
-# Start SUBSYSTEM dcerpc_server
-[SUBSYSTEM::dcerpc_server]
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_AUTH \
-		LIBNDR \
-		dcerpc samba_server_gensec
-
-dcerpc_server_OBJ_FILES = $(addprefix $(rpc_serversrcdir)/, \
-		dcerpc_server.o \
-		dcesrv_auth.o \
-		dcesrv_mgmt.o \
-		handles.o)
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/dcerpc_server_proto.h,$(dcerpc_server_OBJ_FILES:.o=.c)))
-
-# End SUBSYSTEM DCERPC
-################################################
-
-PUBLIC_HEADERS += $(rpc_serversrcdir)/dcerpc_server.h
-
-[MODULE::DCESRV]
-INIT_FUNCTION = server_service_rpc_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = dcerpc_server
-
-DCESRV_OBJ_FILES = $(rpc_serversrcdir)/service_rpc.o
-
-$(eval $(call proto_header_template,$(rpc_serversrcdir)/service_rpc.h,$(DCESRV_OBJ_FILES:.o=.c)))
-
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
deleted file mode 100644
index 2209a6d087..0000000000
--- a/source4/scripting/python/config.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-[SUBSYSTEM::LIBPYTHON]
-PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
-PRIVATE_DEPENDENCIES = PYTALLOC
-INIT_FUNCTION_SENTINEL = { NULL, NULL }
-
-LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
-
-[SUBSYSTEM::PYTALLOC]
-PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC
-
-PYTALLOC_OBJ_FILES = ../lib/talloc/pytalloc.o
-
-[PYTHON::python_uuid]
-PRIVATE_DEPENDENCIES = LIBNDR 
-
-python_uuid_OBJ_FILES = $(pyscriptsrcdir)/uuidmodule.o
-
-[PYTHON::python__glue]
-LIBRARY_REALNAME = samba/_glue.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util
-
-python__glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o
-
-$(python__glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-
-_PY_FILES = $(shell find $(pyscriptsrcdir)/samba -type f -name "*.py")
-
-$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
-
-PYDOCTOR = pydoctor
-PYDOCTOR_OPTIONS = --project-name Samba --project-url http://www.samba.org/ \
-	--make-html
-pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=$(pythonbuilddir) pydoctor --project-name=Samba --project-url=http://www.samba.org/ --make-html --docformat=restructuredtext $(addprefix --add-package $(pythonbuilddir)/, samba)
-
-install:: installpython
-
-PYFLAKES = pyflakes
-
-pyflakes::
-	$(PYFLAKES) $(pyscriptsrcdir)/samba
-
-PYLINT = pylint
-
-pylint:: pythonmods
-	PYTHONPATH=$(pyscriptsrcdir) $(PYLINT) -f parseable samba
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
deleted file mode 100644
index e8035e607c..0000000000
--- a/source4/selftest/config.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \
-    $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
-    --builddir=$(builddir) --srcdir=$(srcdir) \
-    --exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \
-    $(TEST_OPTIONS)
-# this strange code is to handle the fact that the bash pipefail option is 
-# not portable. When we run selftest we use a pipeline, and the first element
-# of that pipeline might abort. We need to catch this and mark the test
-# as having failed
-ST_RM = ( rm -f $(selftest_prefix)/st_done && 
-ST_TOUCH = && touch $(selftest_prefix)/st_done ) 
-ST_DONE_TEST = @test -f $(selftest_prefix)/st_done || { echo "SELFTEST FAILED"; exit 1; }
-
-SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow
-SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick
-FILTER_XFAIL = $(PYTHON) -u $(selftestdir)/filter-subunit --expected-failures=$(srcdir)/selftest/knownfail
-SUBUNIT_FORMATTER ?= $(PYTHON) -u $(selftestdir)/format-subunit --prefix=${selftest_prefix} --immediate
-FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER)
-
-test-subunit:: everything
-	$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
-	$(ST_DONE_TEST)
-
-test-subunit-filtered:: everything
-	$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL)
-	$(ST_DONE_TEST)
-
-slowtest:: everything
-	$(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-ifeq ($(RUN_FROM_BUILD_FARM),yes)
-test:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL) --strip-passed-output
-	$(ST_DONE_TEST)
-	test -f ${selftest_prefix}/summary && cat ${selftest_prefix}/summary
-else
-test:: 
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-endif
-
-kvmtest:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) \
-		--target=kvm --image=$(KVM_IMAGE) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-kvmquicktest:: everything
-	$(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) \
-		$(SELFTEST_QUICK_OPTS) --target=kvm --image=$(KVM_IMAGE) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-testone:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --one $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-test-swrap:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-test-swrap-pcap:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-pcap $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-test-swrap-keep-pcap:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-keep-pcap $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-test-noswrap:: everything
-	$(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-quicktest:: all
-	$(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-quicktest-subunit:: all
-	$(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH)
-	$(ST_DONE_TEST)
-
-quicktestone:: all
-	$(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --one $(TESTS) | $(FORMAT_TEST_OUTPUT)
-	$(ST_DONE_TEST)
-
-testenv:: everything
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
-
-testenv-%:: everything
-	SELFTEST_TESTENV=$* $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
-
-test-%:: 
-	$(MAKE) test TESTS=$*
-
-valgrindtest:: valgrindtest-all
-
-valgrindtest-quick:: all
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT)
-
-valgrindtest-all:: everything
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT)
-
-valgrindtest-env:: everything
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
-
-gdbtest:: gdbtest-all
-
-gdbtest-quick:: all
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT)
-
-gdbtest-all:: everything
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT)
-
-gdbtest-env:: everything
-	SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
-
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
deleted file mode 100644
index a9d3decf49..0000000000
--- a/source4/smb_server/config.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# SMB server subsystem
-#
-[MODULE::SERVICE_SMB]
-INIT_FUNCTION = server_service_smb_init
-SUBSYSTEM = service
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = SMB_SERVER
-
-SERVICE_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_server.o
-
-$(eval $(call proto_header_template,$(smb_serversrcdir)/service_smb_proto.h,$(SERVICE_SMB_OBJ_FILES:.o=.c)))
-
-# samba3 SMB server subsystem
-#
-[MODULE::SERVICE_SAMBA3_SMB]
-INIT_FUNCTION = server_service_samba3_smb_init
-SUBSYSTEM = service
-
-SERVICE_SAMBA3_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_samba3.o
-
-#######################
-# Start SUBSYSTEM SMB
-[SUBSYSTEM::SMB_SERVER]
-PUBLIC_DEPENDENCIES = \
-		share \
-		LIBPACKET \
-		SMB_PROTOCOL \
-		SMB2_PROTOCOL
-# End SUBSYSTEM SMB
-#######################
-
-SMB_SERVER_OBJ_FILES = $(addprefix $(smb_serversrcdir)/, \
-		handle.o \
-		tcon.o \
-		session.o \
-		blob.o \
-		management.o)
-
-$(eval $(call proto_header_template,$(smb_serversrcdir)/smb_server_proto.h,$(SMB_SERVER_OBJ_FILES:.o=.c)))
-
-mkinclude smb/config.mk
-mkinclude smb2/config.mk
diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
deleted file mode 100644
index eadc122831..0000000000
--- a/source4/smb_server/smb/config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#######################
-# Start SUBSYSTEM SMB_PROTOCOL
-[SUBSYSTEM::SMB_PROTOCOL]
-PUBLIC_DEPENDENCIES = \
-		ntvfs LIBPACKET CREDENTIALS samba_server_gensec
-# End SUBSYSTEM SMB_PROTOCOL
-#######################
-
-SMB_PROTOCOL_OBJ_FILES = $(addprefix $(smb_serversrcdir)/smb/, \
-		receive.o \
-		negprot.o \
-		nttrans.o \
-		reply.o \
-		request.o \
-		search.o \
-		service.o \
-		sesssetup.o \
-		srvtime.o \
-		trans2.o \
-		signing.o)
-
-$(eval $(call proto_header_template,$(smb_serversrcdir)/smb/smb_proto.h,$(SMB_PROTOCOL_OBJ_FILES:.o=.c)))
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
deleted file mode 100644
index f0c3739926..0000000000
--- a/source4/smb_server/smb2/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#######################
-# Start SUBSYSTEM SMB2_PROTOCOL
-[SUBSYSTEM::SMB2_PROTOCOL]
-PUBLIC_DEPENDENCIES = \
-		ntvfs LIBPACKET LIBCLI_SMB2 samba_server_gensec
-# End SUBSYSTEM SMB2_PROTOCOL
-#######################
-
-SMB2_PROTOCOL_OBJ_FILES = $(addprefix $(smb_serversrcdir)/smb2/, \
-		receive.o \
-		negprot.o \
-		sesssetup.o \
-		tcon.o \
-		fileio.o \
-		fileinfo.o \
-		find.o \
-		keepalive.o)
-
-$(eval $(call proto_header_template,$(smb_serversrcdir)/smb2/smb2_proto.h,$(SMB2_PROTOCOL_OBJ_FILES:.o=.c)))
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)))
diff --git a/source4/static_deps.mk b/source4/static_deps.mk
deleted file mode 100644
index e366abf681..0000000000
--- a/source4/static_deps.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# These should also be autogenerated at some point
-# perhaps by some perl scripts run from config.status ?
-#
-$(gen_ndrsrcdir)/misc.h: idl
-$(ndrsrcdir)/libndr.h: $(gen_ndrsrcdir)/misc.h
-$(dcerpcsrcdir)/dcerpc.h: $(dcerpcsrcdir)/dcerpc_proto.h
-$(authsrcdir)/credentials/credentials.h: $(authsrcdir)/credentials/credentials_proto.h
-$(libclisrcdir)/nbt/libnbt.h: $(libclisrcdir)/nbt/nbt_proto.h
-
-include/includes.h: \
-		include/config.h \
-		$(gen_ndrsrcdir)/misc.h
-
-proto::
-basics:: include/includes.h idl proto
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
deleted file mode 100644
index 4e5c852df7..0000000000
--- a/source4/torture/config.mk
+++ /dev/null
@@ -1,382 +0,0 @@
-[SUBSYSTEM::TORTURE_UTIL]
-PRIVATE_DEPENDENCIES = LIBCLI_RAW
-PUBLIC_DEPENDENCIES = torture POPT_CREDENTIALS
-
-TORTURE_UTIL_OBJ_FILES = $(addprefix $(torturesrcdir)/, util_smb.o)
-
-#################################
-# Start SUBSYSTEM TORTURE_BASIC
-[MODULE::TORTURE_BASIC]
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_base_init
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB POPT_CREDENTIALS \
-		TORTURE_UTIL LIBCLI_RAW \
-		TORTURE_RAW
-# End SUBSYSTEM TORTURE_BASIC
-#################################
-
-TORTURE_BASIC_OBJ_FILES = $(addprefix $(torturesrcdir)/basic/,  \
-		base.o \
-		misc.o \
-		scanner.o \
-		utable.o \
-		charset.o \
-		mangle_test.o \
-		denytest.o \
-		aliases.o \
-		locking.o \
-		secleak.o \
-		rename.o \
-		dir.o \
-		delete.o \
-		unlink.o \
-		disconnect.o \
-		delaywrite.o \
-		attr.o \
-		properties.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/basic/proto.h,$(TORTURE_BASIC_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_RAW
-[MODULE::TORTURE_RAW]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_raw_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
-		POPT_CREDENTIALS TORTURE_UTIL
-# End SUBSYSTEM TORTURE_RAW
-#################################
-
-TORTURE_RAW_OBJ_FILES = $(addprefix $(torturesrcdir)/raw/, \
-		qfsinfo.o \
-		qfileinfo.o \
-		setfileinfo.o \
-		search.o \
-		close.o \
-		open.o \
-		mkdir.o \
-		oplock.o \
-		notify.o \
-		mux.o \
-		ioctl.o \
-		chkpath.o \
-		unlink.o \
-		read.o \
-		context.o \
-		write.o \
-		lock.o \
-		pingpong.o \
-		lockbench.o \
-		lookuprate.o \
-		tconrate.o \
-		openbench.o \
-		rename.o \
-		eas.o \
-		streams.o \
-		acls.o \
-		seek.o \
-		samba3hide.o \
-		samba3misc.o \
-		composite.o \
-		raw.o \
-		offline.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/raw/proto.h,$(TORTURE_RAW_OBJ_FILES:.o=.c)))
-
-mkinclude smb2/config.mk
-mkinclude winbind/config.mk
-mkinclude libnetapi/config.mk
-mkinclude libsmbclient/config.mk
-
-[SUBSYSTEM::TORTURE_NDR]
-PRIVATE_DEPENDENCIES = torture SERVICE_SMB
-
-TORTURE_NDR_OBJ_FILES = $(addprefix $(torturesrcdir)/ndr/, ndr.o winreg.o atsvc.o lsa.o epmap.o dfs.o netlogon.o drsuapi.o spoolss.o samr.o dfsblob.o drsblobs.o nbt.o ntlmssp.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ndr/proto.h,$(TORTURE_NDR_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::TORTURE_DFS]
-PRIVATE_DEPENDENCIES = torture LIBCLI_SMB NDR_DFSBLOBS TORTURE_UTIL
-
-TORTURE_DFS_OBJ_FILES = $(addprefix $(torturesrcdir)/dfs/, common.o domaindfs.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/dfs/proto.h,$(TORTURE_DFS_OBJ_FILES:.o=.c)))
-
-[MODULE::torture_rpc]
-OUTPUT_TYPE = MERGED_OBJ
-# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-#OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_rpc_init
-PRIVATE_DEPENDENCIES = \
-		NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
-		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
-		RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
-		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \
-		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \
-		LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP TORTURE_DFS \
-		dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE
-
-torture_rpc_OBJ_FILES = $(addprefix $(torturesrcdir)/rpc/, \
-		join.o lsa.o forest_trust.o lsa_lookup.o session_key.o echo.o dfs.o drsuapi.o \
-		drsuapi_cracknames.o dssync.o dsgetinfo.o spoolss.o spoolss_notify.o spoolss_win.o spoolss_access.o \
-		unixinfo.o samr.o samr_accessmask.o wkssvc.o srvsvc.o svcctl.o atsvc.o \
-		eventlog.o epmapper.o winreg.o initshutdown.o oxidresolve.o remact.o mgmt.o \
-		scanner.o autoidl.o countcalls.o testjoin.o schannel.o netlogon.o remote_pac.o samlogon.o \
-		samsync.o multi_bind.o dssetup.o alter_context.o bench.o samba3rpc.o rpc.o async_bind.o \
-		handles.o frsapi.o object_uuid.o ntsvcs.o browser.o bind.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/rpc/proto.h,$(torture_rpc_OBJ_FILES:.o=.c)))
-
-#################################
-# RPC/Local DRSUAPI tests
-mkinclude drs/config.mk
-
-#################################
-# Start SUBSYSTEM TORTURE_RAP
-[MODULE::TORTURE_RAP]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_rap_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB NDR_RAP
-# End SUBSYSTEM TORTURE_RAP
-#################################
-
-TORTURE_RAP_OBJ_FILES = $(torturesrcdir)/rap/rap.o $(torturesrcdir)/rap/rpc.o $(torturesrcdir)/rap/printing.o $(torturesrcdir)/rap/sam.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/rap/proto.h,$(TORTURE_RAP_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_AUTH
-[MODULE::TORTURE_AUTH]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB gensec auth KERBEROS \
-		POPT_CREDENTIALS SMBPASSWD torture
-# End SUBSYSTEM TORTURE_AUTH
-#################################
-
-TORTURE_AUTH_OBJ_FILES = $(addprefix $(torturesrcdir)/auth/, ntlmssp.o pac.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/auth/proto.h,$(TORTURE_AUTH_OBJ_FILES:.o=.c)))
-
-mkinclude local/config.mk
-
-#################################
-# Start MODULE TORTURE_NBENCH
-[MODULE::TORTURE_NBENCH]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_nbench_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL 
-# End MODULE TORTURE_NBENCH
-#################################
-
-TORTURE_NBENCH_OBJ_FILES = $(addprefix $(torturesrcdir)/nbench/, nbio.o nbench.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/nbench/proto.h,$(TORTURE_NBENCH_OBJ_FILES:.o=.c)))
-
-#################################
-# Start MODULE TORTURE_UNIX
-[MODULE::TORTURE_UNIX]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_unix_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL 
-# End MODULE TORTURE_UNIX
-#################################
-
-TORTURE_UNIX_OBJ_FILES = $(addprefix $(torturesrcdir)/unix/, unix.o whoami.o unix_info2.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/unix/proto.h,$(TORTURE_UNIX_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_LDAP
-[MODULE::TORTURE_LDAP]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_ldap_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP
-# End SUBSYSTEM TORTURE_LDAP
-#################################
-
-TORTURE_LDAP_OBJ_FILES = $(addprefix $(torturesrcdir)/ldap/, common.o basic.o schema.o uptodatevector.o \
-	cldap.o cldapbench.o ldap_sort.o nested_search.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ldap/proto.h,$(TORTURE_LDAP_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NBT
-[MODULE::TORTURE_NBT]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_nbt_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc
-# End SUBSYSTEM TORTURE_NBT
-#################################
-
-TORTURE_NBT_OBJ_FILES = $(addprefix $(torturesrcdir)/nbt/, query.o register.o \
-	wins.o winsbench.o winsreplication.o dgram.o nbt.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/nbt/proto.h,$(TORTURE_NBT_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NET
-[MODULE::TORTURE_NET]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_net_init
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-NET \
-		POPT_CREDENTIALS \
-		torture_rpc \
-		PROVISION
-# End SUBSYSTEM TORTURE_NET
-#################################
-
-TORTURE_NET_OBJ_FILES = $(addprefix $(torturesrcdir)/libnet/, libnet.o \
-					   utils.o userinfo.o userman.o groupinfo.o groupman.o \
-					   domain.o libnet_lookup.o libnet_user.o libnet_group.o \
-					   libnet_share.o libnet_rpc.o libnet_domain.o libnet_BecomeDC.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libnet/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NTP
-[MODULE::TORTURE_NTP]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_ntp_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		torture_rpc 
-# End SUBSYSTEM TORTURE_NTP
-#################################
-
-TORTURE_NTP_OBJ_FILES = $(addprefix $(torturesrcdir)/ntp/, ntp_signd.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ntp/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
-
-#################################
-# Start BINARY smbtorture
-[BINARY::smbtorture]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		torture \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		dcerpc \
-		LIBCLI_SMB \
-		SMBREADLINE
-# End BINARY smbtorture
-#################################
-
-smbtorture_OBJ_FILES = \
-		$(torturesrcdir)/smbtorture.o \
-		$(torturesrcdir)/torture.o  \
-		$(torturesrcdir)/shell.o
-
-PUBLIC_HEADERS += $(torturesrcdir)/smbtorture.h
-MANPAGES += $(torturesrcdir)/man/smbtorture.1
-
-#################################
-# Start BINARY gentest
-[BINARY::gentest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBCLI_SMB \
-		LIBCLI_RAW
-# End BINARY gentest
-#################################
-
-gentest_OBJ_FILES = $(torturesrcdir)/gentest.o
-
-MANPAGES += $(torturesrcdir)/man/gentest.1
-
-#################################
-# Start BINARY masktest
-[BINARY::masktest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBCLI_SMB
-# End BINARY masktest
-#################################
-
-masktest_OBJ_FILES = $(torturesrcdir)/masktest.o
-
-MANPAGES += $(torturesrcdir)/man/masktest.1
-
-#################################
-# Start BINARY locktest
-[BINARY::locktest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBSAMBA-UTIL \
-		LIBCLI_SMB \
-		LIBSAMBA-HOSTCONFIG
-# End BINARY locktest
-#################################
-
-locktest_OBJ_FILES = $(torturesrcdir)/locktest.o
-
-MANPAGES += $(torturesrcdir)/man/locktest.1
-
-GCOV=0
-
-ifeq ($(MAKECMDGOALS),gcov)
-GCOV=1
-endif
-
-ifeq ($(MAKECMDGOALS),lcov)
-GCOV=1
-endif
-
-ifeq ($(MAKECMDGOALS),testcov-html)
-GCOV=1
-endif
-
-ifeq ($(GCOV),1)
-CFLAGS += --coverage
-LDFLAGS += --coverage
-endif
-
-COV_TARGET = test
-
-gcov: test
-	for I in $(sort $(dir $(ALL_OBJS))); \
-		do $(GCOV) -p -o $$I $$I/*.c; \
-	done
-
-samba4.info: test
-	-rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
-	cd .. && lcov --base-directory `pwd`/source4 --directory source4 --directory nsswitch --directory libcli --directory librpc --directory lib --capture --output-file source4/samba4.info
-
-lcov: samba4.info
-	genhtml -o coverage $<
-
-testcov-html:: lcov
-
-clean::
-	@rm -f samba.info
diff --git a/source4/torture/drs/config.mk b/source4/torture/drs/config.mk
deleted file mode 100644
index 0fdeb97df1..0000000000
--- a/source4/torture/drs/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_DRS
-[MODULE::TORTURE_DRS]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_drs_init
-PRIVATE_DEPENDENCIES = \
-		NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
-		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
-		RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
-		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \
-		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \
-		LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP \
-		dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE
-# End SUBSYSTEM TORTURE_DRS
-#################################
-
-TORTURE_DRS_OBJ_FILES = \
-		$(torturesrcdir)/drs/drs_init.o \
-		$(torturesrcdir)/drs/drs_util.o \
-		$(torturesrcdir)/drs/unit/schemainfo_tests.o \
-		$(torturesrcdir)/drs/unit/prefixmap_tests.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/drs/proto.h,$(TORTURE_DRS_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/libnetapi/config.m4 b/source4/torture/libnetapi/config.m4
deleted file mode 100644
index 402f1123a5..0000000000
--- a/source4/torture/libnetapi/config.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# start SMB_EXT_LIB_NETAPI
-# check for netapi.h and -lnetapi
-
-use_netapi=auto
-AC_ARG_ENABLE(netapi,
-AS_HELP_STRING([--enable-netapi],[Turn on netapi support (default=auto)]),
-    [if test x$enable_netapi = xno; then
-        use_netapi=no
-    fi])
-
-
-#if test x$use_netapi = xauto && pkg-config --exists netapi; then
-#	SMB_EXT_LIB_FROM_PKGCONFIG(NETAPI, netapi < 0.1,
-#							   [use_netapi=yes],
-#							   [use_netapi=no])
-#fi
-
-SMB_ENABLE(TORTURE_LIBNETAPI,NO)
-if test x$use_netapi != xno; then
-	AC_CHECK_HEADERS(netapi.h)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, libnetapi_init)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserModalsGet)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetGroups)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetInfo)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserSetInfo)
-	if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then
-		AC_DEFINE(ENABLE_LIBNETAPI,1,[Whether we have libnetapi on the host system])
-		SMB_ENABLE(NETAPI,YES)
-		SMB_ENABLE(TORTURE_LIBNETAPI,YES)
-	else
-		if test x$use_netapi != xauto; then
-			AC_MSG_ERROR([--enable-netapi: libnetapi not found])
-		fi
-	fi
-	SMB_EXT_LIB(NETAPI, $NETAPI_LIBS)
-fi
diff --git a/source4/torture/libnetapi/config.mk b/source4/torture/libnetapi/config.mk
deleted file mode 100644
index 0cd485e44a..0000000000
--- a/source4/torture/libnetapi/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LIBNETAPI
-[MODULE::TORTURE_LIBNETAPI]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_libnetapi_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		NETAPI
-# End SUBSYSTEM TORTURE_LIBNETAPI
-#################################
-
-TORTURE_LIBNETAPI_OBJ_FILES = $(addprefix $(torturesrcdir)/libnetapi/, libnetapi.o \
-					libnetapi_user.o \
-					libnetapi_group.o
-					libnetapi_server.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libnetapi/proto.h,$(TORTURE_LIBNETAPI_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/libsmbclient/config.m4 b/source4/torture/libsmbclient/config.m4
deleted file mode 100644
index 481e2fa968..0000000000
--- a/source4/torture/libsmbclient/config.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################
-# start SMB_EXT_LIB_LIBSMBCLIENT
-# check for libsmbclient.h and -lsmbclient
-
-use_libsmbclient=auto
-AC_ARG_ENABLE(libsmbclient,
-AS_HELP_STRING([--enable-libsmbclient],[Turn on libsmbclient support (default=auto)]),
-    [if test x$enable_libsmbclient = xno; then
-        use_libsmbclient=no
-    fi])
-
-
-#if test x$use_libsmbclient = xauto && pkg-config --exists libsmbclient; then
-#	SMB_EXT_LIB_FROM_PKGCONFIG(LIBSMBCLIENT, libsmbclient < 0.1,
-#							   [use_libsmbclient=yes],
-#							   [use_libsmbclient=no])
-#fi
-
-SMB_ENABLE(TORTURE_LIBSMBCLIENT,NO)
-if test x$use_libsmbclient != xno; then
-	AC_CHECK_HEADERS(libsmbclient.h)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_new_context)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_getOptionNoAutoAnonymousLogin)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_setOptionCaseSensitive)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_setOptionUseCCache)
-	if test x"$ac_cv_header_libsmbclient_h" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_new_context" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_getOptionNoAutoAnonymousLogin" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_setOptionCaseSensitive" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_setOptionUseCCache" = x"yes"; then
-		AC_DEFINE(ENABLE_LIBSMBCLIENT,1,[Whether we have libsmbclient on the host system])
-		SMB_ENABLE(SMBCLIENT,YES)
-		SMB_ENABLE(TORTURE_LIBSMBCLIENT,YES)
-	else
-		if test x$use_libsmbclient != xauto; then
-			AC_MSG_ERROR([--enable-libsmbclient: libsmbclient not found])
-		fi
-	fi
-	SMB_EXT_LIB(SMBCLIENT, $SMBCLIENT_LIBS)
-fi
diff --git a/source4/torture/libsmbclient/config.mk b/source4/torture/libsmbclient/config.mk
deleted file mode 100644
index a1c62fbf81..0000000000
--- a/source4/torture/libsmbclient/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LIBSMBCLIENT
-[MODULE::TORTURE_LIBSMBCLIENT]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_libsmbclient_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		SMBCLIENT
-# End SUBSYSTEM TORTURE_LIBSMBCLIENT
-#################################
-
-TORTURE_LIBSMBCLIENT_OBJ_FILES = $(addprefix $(torturesrcdir)/libsmbclient/, libsmbclient.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libsmbclient/proto.h,$(TORTURE_LIBSMBCLIENT_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
deleted file mode 100644
index d56306b794..0000000000
--- a/source4/torture/local/config.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LOCAL
-[MODULE::TORTURE_LOCAL]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_local_init
-PRIVATE_DEPENDENCIES = \
-		RPC_NDR_ECHO \
-		TDR \
-		LIBCLI_SMB \
-		MESSAGING \
-		ICONV \
-		POPT_CREDENTIALS \
-		TORTURE_AUTH \
-		TORTURE_UTIL \
-		TORTURE_NDR \
-		TORTURE_LIBCRYPTO \
-		share \
-		torture_registry \
-		PROVISION \
-		NSS_WRAPPER \
-		LDB \
-		SAMDB
-# End SUBSYSTEM TORTURE_LOCAL
-#################################
-
-TORTURE_LOCAL_OBJ_FILES = \
-		$(torturesrcdir)/../../lib/util/charset/tests/iconv.o \
-		$(torturesrcdir)/../../lib/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)/../lib/messaging/tests/messaging.o \
-		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
-		$(torturesrcdir)/../librpc/tests/binding_string.o \
-		$(torturesrcdir)/../../lib/util/tests/idtree.o \
-		$(torturesrcdir)/../../lib/util/tests/dlinklist.o \
-		$(torturesrcdir)/../lib/socket/testsuite.o \
-		$(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
-		$(torturesrcdir)/../../lib/nss_wrapper/testsuite.o \
-		$(torturesrcdir)/../libcli/resolve/testsuite.o \
-		$(torturesrcdir)/../../lib/util/tests/strlist.o \
-		$(torturesrcdir)/../../lib/util/tests/parmlist.o \
-		$(torturesrcdir)/../../lib/util/tests/str.o \
-		$(torturesrcdir)/../../lib/util/tests/time.o \
-		$(torturesrcdir)/../../lib/util/tests/asn1_tests.o \
-		$(torturesrcdir)/../../lib/util/tests/data_blob.o \
-		$(torturesrcdir)/../../lib/util/tests/file.o \
-		$(torturesrcdir)/../../lib/util/tests/genrand.o \
-		$(torturesrcdir)/../../lib/compression/testsuite.o \
-		$(torturesrcdir)/../../lib/util/charset/tests/charset.o \
-		$(torturesrcdir)/../libcli/security/tests/sddl.o \
-		$(libtdrsrcdir)/testsuite.o \
-		$(torturesrcdir)/../../lib/tevent/testsuite.o \
-		$(torturesrcdir)/../param/tests/share.o \
-		$(torturesrcdir)/../param/tests/loadparm.o \
-		$(torturesrcdir)/../auth/credentials/tests/simple.o \
-		$(torturesrcdir)/local/local.o \
-		$(torturesrcdir)/local/dbspeed.o \
-		$(torturesrcdir)/local/torture.o \
-		$(torturesrcdir)/ldb/ldb.o \
-		$(torturesrcdir)/../dsdb/common/tests/dsdb_dn.o \
-		$(torturesrcdir)/../dsdb/schema/tests/schema_syntax.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/local/proto.h,$(TORTURE_LOCAL_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
deleted file mode 100644
index 8ff38bbf40..0000000000
--- a/source4/torture/smb2/config.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#################################
-# Start SUBSYSTEM TORTURE_SMB2
-[MODULE::TORTURE_SMB2]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_smb2_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB2 POPT_CREDENTIALS torture
-# End SUBSYSTEM TORTURE_SMB2
-#################################
-
-TORTURE_SMB2_OBJ_FILES = $(addprefix $(torturesrcdir)/smb2/, \
-		connect.o \
-		scan.o \
-		util.o \
-		getinfo.o \
-		setinfo.o \
-		lock.o \
-		notify.o \
-		smb2.o \
-		durable_open.o \
-		oplock.o \
-		dir.o \
-		lease.o \
-		create.o \
-		acls.o \
-		read.o \
-		compound.o \
-		streams.o)
-
-
-$(eval $(call proto_header_template,$(torturesrcdir)/smb2/proto.h,$(TORTURE_SMB2_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/winbind/config.mk b/source4/torture/winbind/config.mk
deleted file mode 100644
index 2bd613d649..0000000000
--- a/source4/torture/winbind/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#################################
-# Start SUBSYSTEM TORTURE_WINBIND
-[MODULE::TORTURE_WINBIND]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_winbind_init
-PRIVATE_DEPENDENCIES = \
-		LIBWBCLIENT LIBWINBIND-CLIENT torture PAM_ERRORS
-# End SUBSYSTEM TORTURE_WINBIND
-#################################
-
-TORTURE_WINBIND_OBJ_FILES = $(addprefix $(torturesrcdir)/winbind/, winbind.o struct_based.o) ../nsswitch/libwbclient/tests/wbclient.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/winbind/proto.h,$(TORTURE_WINBIND_OBJ_FILES:.o=.c)))
-
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
deleted file mode 100644
index dcf1bdf2d0..0000000000
--- a/source4/utils/config.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# utils subsystem
-
-#################################
-# Start BINARY ntlm_auth
-[BINARY::ntlm_auth]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		gensec \
-		LIBCLI_RESOLVE \
-		auth \
-		ntlm_check \
-		MESSAGING \
-		LIBEVENTS
-# End BINARY ntlm_auth
-#################################
-
-ntlm_auth_OBJ_FILES = $(utilssrcdir)/ntlm_auth.o
-
-MANPAGES += $(utilssrcdir)/man/ntlm_auth.1
-
-
-
-#################################
-# Start BINARY setnttoken
-[BINARY::setnttoken]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES =
-# End BINARY setnttoken
-#################################
-
-setnttoken_OBJ_FILES = $(utilssrcdir)/setnttoken.o
-
-#################################
-# Start BINARY testparm
-[BINARY::testparm]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		samba_socket \
-		POPT_SAMBA \
-		LIBCLI_RESOLVE \
-		CHARSET
-# End BINARY testparm
-#################################
-
-testparm_OBJ_FILES = $(utilssrcdir)/testparm.o
-
-################################################
-# Start BINARY oLschema2ldif
-[BINARY::oLschema2ldif]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE SAMDB
-# End BINARY oLschema2ldif
-################################################
-
-
-oLschema2ldif_OBJ_FILES = $(addprefix $(utilssrcdir)/, oLschema2ldif.o)
-
-MANPAGES += $(utilssrcdir)/man/oLschema2ldif.1
-
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
deleted file mode 100644
index 74ecdb5f19..0000000000
--- a/source4/web_server/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# web server subsystem
-
-#######################
-# Start SUBSYSTEM WEB
-[MODULE::WEB]
-INIT_FUNCTION = server_service_web_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = LIBTLS smbcalls process_model LIBPYTHON LIBTSOCKET
-# End SUBSYSTEM WEB
-#######################
-
-WEB_OBJ_FILES = $(addprefix $(web_serversrcdir)/, web_server.o wsgi.o) 
-
-$(eval $(call proto_header_template,$(web_serversrcdir)/proto.h,$(WEB_OBJ_FILES:.o=.c)))
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
deleted file mode 100644
index 0bee89c93b..0000000000
--- a/source4/winbind/config.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# server subsystem
-
-#######################
-# Start SUBSYSTEM WINBIND
-[MODULE::WINBIND]
-INIT_FUNCTION = server_service_winbind_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		WB_HELPER \
-		IDMAP \
-		NDR_WINBIND \
-		process_model \
-		RPC_NDR_LSA \
-		dcerpc_samr \
-		PAM_ERRORS \
-		LIBCLI_LDAP \
-		LIBSAMBA-NET
-# End SUBSYSTEM WINBIND
-#######################
-
-WINBIND_OBJ_FILES = $(addprefix $(winbindsrcdir)/, \
-		wb_server.o \
-		wb_irpc.o \
-		wb_samba3_protocol.o \
-		wb_samba3_cmd.o \
-		wb_init_domain.o \
-		wb_dom_info.o \
-		wb_dom_info_trusted.o \
-		wb_sid2domain.o \
-		wb_name2domain.o \
-		wb_sids2xids.o \
-		wb_xids2sids.o \
-		wb_gid2sid.o \
-		wb_sid2uid.o \
-		wb_sid2gid.o \
-		wb_uid2sid.o \
-		wb_connect_lsa.o \
-		wb_connect_sam.o \
-		wb_cmd_lookupname.o \
-		wb_cmd_lookupsid.o \
-		wb_cmd_getdcname.o \
-		wb_cmd_getgrnam.o \
-		wb_cmd_getgrgid.o \
-		wb_cmd_getpwnam.o \
-		wb_cmd_getpwuid.o \
-		wb_cmd_userdomgroups.o \
-		wb_cmd_usersids.o \
-		wb_cmd_list_groups.o \
-		wb_cmd_list_trustdom.o \
-		wb_cmd_list_users.o \
-		wb_cmd_setpwent.o \
-		wb_cmd_getpwent.o \
-		wb_cmd_getgrent.o \
-		wb_cmd_setgrent.o \
-		wb_cmd_getgroups.o \
-		wb_pam_auth.o \
-		wb_sam_logon.o)
-
-$(eval $(call proto_header_template,$(winbindsrcdir)/wb_proto.h,$(WINBIND_OBJ_FILES:.o=.c)))
-
-################################################
-# Start SUBYSTEM WB_HELPER
-[SUBSYSTEM::WB_HELPER]
-PUBLIC_DEPENDENCIES = RPC_NDR_LSA dcerpc_samr
-# End SUBSYSTEM WB_HELPER
-################################################
-
-WB_HELPER_OBJ_FILES = $(addprefix $(winbindsrcdir)/, wb_async_helpers.o wb_utils.o)
-
-$(eval $(call proto_header_template,$(winbindsrcdir)/wb_helper.h,$(WB_HELPER_OBJ_FILES:.o=.c)))
-
-################################################
-# Start SUBYSTEM IDMAP
-[SUBSYSTEM::IDMAP]
-PUBLIC_DEPENDENCIES = SAMDB_COMMON
-# End SUBSYSTEM IDMAP
-################################################
-
-IDMAP_OBJ_FILES = $(winbindsrcdir)/idmap.o
-
-$(eval $(call proto_header_template,$(winbindsrcdir)/idmap_proto.h,$(IDMAP_OBJ_FILES:.o=.c)))
diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
deleted file mode 100644
index b8696868db..0000000000
--- a/source4/wrepl_server/config.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# WREPL server subsystem
-
-#######################
-# Start SUBSYSTEM WREPL_SRV
-[MODULE::WREPL_SRV]
-INIT_FUNCTION = server_service_wrepl_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_WREPL WINSDB process_model 
-# End SUBSYSTEM WREPL_SRV
-#######################
-
-WREPL_SRV_OBJ_FILES = $(addprefix $(wrepl_serversrcdir)/, \
-		wrepl_server.o \
-		wrepl_in_connection.o \
-		wrepl_in_call.o \
-		wrepl_apply_records.o \
-		wrepl_periodic.o \
-		wrepl_scavenging.o \
-		wrepl_out_pull.o \
-		wrepl_out_push.o \
-		wrepl_out_helpers.o)
-
-$(eval $(call proto_header_template,$(wrepl_serversrcdir)/wrepl_server_proto.h,$(WREPL_SRV_OBJ_FILES:.o=.c)))