s4: Remove the old perl/m4/make/mk-based build system.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 31 Oct 2010 01:17:29 +0000 (02:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 31 Oct 2010 02:01:44 +0000 (02:01 +0000)
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

162 files changed:
lib/async_req/config.mk [deleted file]
lib/crypto/config.mk [deleted file]
lib/nss_wrapper/config.mk [deleted file]
lib/popt/config.mk [deleted file]
lib/smbconf/config.mk [deleted file]
lib/socket_wrapper/config.mk [deleted file]
lib/talloc/config.mk [deleted file]
lib/tdb/config.mk [deleted file]
lib/tdr/config.mk [deleted file]
lib/torture/config.mk [deleted file]
lib/tsocket/config.mk [deleted file]
lib/uid_wrapper/config.mk [deleted file]
lib/util/capability.m4 [deleted file]
lib/util/charset/config.m4 [deleted file]
lib/util/charset/config.mk [deleted file]
lib/util/config.mk [deleted file]
lib/util/fault.m4 [deleted file]
lib/util/fsusage.m4 [deleted file]
lib/util/signal.m4 [deleted file]
lib/util/util.m4 [deleted file]
lib/util/xattr.m4 [deleted file]
libcli/auth/config.mk [deleted file]
libcli/cldap/config.mk [deleted file]
libcli/drsuapi/config.mk [deleted file]
libcli/ldap/config.mk [deleted file]
libcli/named_pipe_auth/config.mk [deleted file]
libcli/nbt/config.mk [deleted file]
libcli/samsync/config.mk [deleted file]
libcli/security/config.mk [deleted file]
libcli/smb/config.mk [deleted file]
libcli/smbreadline/readline.m4 [deleted file]
libgpo/config.mk [deleted file]
nsswitch/config.m4 [deleted file]
nsswitch/config.mk [deleted file]
nsswitch/libwbclient/config.mk [deleted file]
nsswitch/nsstest.m4 [deleted file]
pidl/config.m4 [deleted file]
pidl/config.mk [deleted file]
source4/Makefile.in [deleted file]
source4/aclocal.m4 [deleted file]
source4/auth/config.m4 [deleted file]
source4/auth/config.mk [deleted file]
source4/auth/credentials/config.mk [deleted file]
source4/auth/gensec/config.m4 [deleted file]
source4/auth/gensec/config.mk [deleted file]
source4/auth/kerberos/config.m4 [deleted file]
source4/auth/kerberos/config.mk [deleted file]
source4/auth/ntlm/config.mk [deleted file]
source4/auth/ntlmssp/config.mk [deleted file]
source4/autogen-autotools.sh [deleted file]
source4/build/m4/ax_cflags_gcc_option.m4 [deleted file]
source4/build/m4/ax_cflags_irix_option.m4 [deleted file]
source4/build/m4/check_cc.m4 [deleted file]
source4/build/m4/check_doc.m4 [deleted file]
source4/build/m4/check_ld.m4 [deleted file]
source4/build/m4/check_path.m4 [deleted file]
source4/build/m4/env.m4 [deleted file]
source4/build/m4/public.m4 [deleted file]
source4/build/make/lex_compile.sh [deleted file]
source4/build/make/python.mk [deleted file]
source4/build/make/rules.mk [deleted file]
source4/build/make/templates.mk [deleted file]
source4/build/make/yacc_compile.sh [deleted file]
source4/build/smb_build/README.txt [deleted file]
source4/build/smb_build/TODO [deleted file]
source4/build/smb_build/config_mk.pm [deleted file]
source4/build/smb_build/dot.pl [deleted file]
source4/build/smb_build/input.pm [deleted file]
source4/build/smb_build/main.pl [deleted file]
source4/build/smb_build/makefile.pm [deleted file]
source4/build/smb_build/output.pm [deleted file]
source4/build/smb_build/summary.pm [deleted file]
source4/cldap_server/config.mk [deleted file]
source4/client/config.mk [deleted file]
source4/cluster/config.mk [deleted file]
source4/config.guess [deleted file]
source4/config.sub [deleted file]
source4/configure.ac [deleted file]
source4/dsdb/config.mk [deleted file]
source4/dsdb/samdb/ldb_modules/config.mk [deleted file]
source4/dynconfig/config.mk [deleted file]
source4/headermap.txt [deleted file]
source4/heimdal/cf/check-var.m4 [deleted file]
source4/heimdal/cf/find-func-no-libs.m4 [deleted file]
source4/heimdal/cf/find-func-no-libs2.m4 [deleted file]
source4/heimdal/cf/find-func.m4 [deleted file]
source4/heimdal/cf/resolv.m4 [deleted file]
source4/heimdal_build/config.m4 [deleted file]
source4/heimdal_build/external.m4 [deleted file]
source4/heimdal_build/internal.m4 [deleted file]
source4/heimdal_build/internal.mk [deleted file]
source4/install-sh [deleted file]
source4/kdc/config.m4 [deleted file]
source4/kdc/config.mk [deleted file]
source4/ldap_server/config.mk [deleted file]
source4/lib/basic.mk [deleted file]
source4/lib/cmdline/config.mk [deleted file]
source4/lib/com/config.mk [deleted file]
source4/lib/events/config.mk [deleted file]
source4/lib/ldb-samba/config.mk [deleted file]
source4/lib/ldb/external/libevents.m4 [deleted file]
source4/lib/ldb/external/libpopt.m4 [deleted file]
source4/lib/ldb/external/libtalloc.m4 [deleted file]
source4/lib/ldb/external/libtdb.m4 [deleted file]
source4/lib/ldb/external/pkg.m4 [deleted file]
source4/lib/ldb/ldb_ildap/config.mk [deleted file]
source4/lib/ldb/tools/config.mk [deleted file]
source4/lib/messaging/config.mk [deleted file]
source4/lib/policy/config.mk [deleted file]
source4/lib/registry/config.mk [deleted file]
source4/lib/samba3/config.mk [deleted file]
source4/lib/socket/config.m4 [deleted file]
source4/lib/socket/config.mk [deleted file]
source4/lib/stream/config.mk [deleted file]
source4/lib/tls/config.m4 [deleted file]
source4/lib/tls/config.mk [deleted file]
source4/lib/wmi/config.mk [deleted file]
source4/lib/zlib.mk [deleted file]
source4/libcli/config.mk [deleted file]
source4/libcli/ldap/config.mk [deleted file]
source4/libcli/security/config.mk [deleted file]
source4/libcli/smb2/config.mk [deleted file]
source4/libcli/wbclient/config.mk [deleted file]
source4/libnet/config.mk [deleted file]
source4/librpc/config.mk [deleted file]
source4/main.mk [deleted file]
source4/min_versions.m4 [deleted file]
source4/nbt_server/config.mk [deleted file]
source4/ntp_signd/config.mk [deleted file]
source4/ntptr/config.mk [deleted file]
source4/ntvfs/common/config.mk [deleted file]
source4/ntvfs/config.mk [deleted file]
source4/ntvfs/posix/config.m4 [deleted file]
source4/ntvfs/posix/config.mk [deleted file]
source4/ntvfs/sysdep/config.m4 [deleted file]
source4/ntvfs/sysdep/config.mk [deleted file]
source4/ntvfs/unixuid/config.m4 [deleted file]
source4/ntvfs/unixuid/config.mk [deleted file]
source4/param/config.mk [deleted file]
source4/rpc_server/config.mk [deleted file]
source4/scripting/python/config.mk [deleted file]
source4/selftest/config.mk [deleted file]
source4/smb_server/config.mk [deleted file]
source4/smb_server/smb/config.mk [deleted file]
source4/smb_server/smb2/config.mk [deleted file]
source4/smbd/config.mk [deleted file]
source4/smbd/process_model.m4 [deleted file]
source4/smbd/process_model.mk [deleted file]
source4/static_deps.mk [deleted file]
source4/torture/config.mk [deleted file]
source4/torture/drs/config.mk [deleted file]
source4/torture/libnetapi/config.m4 [deleted file]
source4/torture/libnetapi/config.mk [deleted file]
source4/torture/libsmbclient/config.m4 [deleted file]
source4/torture/libsmbclient/config.mk [deleted file]
source4/torture/local/config.mk [deleted file]
source4/torture/smb2/config.mk [deleted file]
source4/torture/winbind/config.mk [deleted file]
source4/utils/config.mk [deleted file]
source4/web_server/config.mk [deleted file]
source4/winbind/config.mk [deleted file]
source4/wrepl_server/config.mk [deleted file]

diff --git a/lib/async_req/config.mk b/lib/async_req/config.mk
deleted file mode 100644 (file)
index 64e537c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::LIBASYNC_REQ]
-PUBLIC_DEPENDENCIES = LIBREPLACE_NETWORK LIBTALLOC LIBTEVENT
-
-LIBASYNC_REQ_OBJ_FILES = $(addprefix ../lib/async_req/, async_sock.o)
diff --git a/lib/crypto/config.mk b/lib/crypto/config.mk
deleted file mode 100644 (file)
index c9ba779..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################
-# Start SUBSYSTEM LIBCRYPTO
-[SUBSYSTEM::LIBCRYPTO]
-# End SUBSYSTEM LIBCRYPTO
-##############################
-
-LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
-                                        crc32.o md5.o hmacmd5.o md4.o \
-                                        arcfour.o sha256.o hmacsha256.o \
-                                        aes.o rijndael-alg-fst.o)
-
-[SUBSYSTEM::TORTURE_LIBCRYPTO]
-PRIVATE_DEPENDENCIES = LIBCRYPTO
-
-TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
-               md4test.o md5test.o hmacmd5test.o)
-
-$(eval $(call proto_header_template,$(libcryptosrcdir)/test_proto.h,$(TORTURE_LIBCRYPTO_OBJ_FILES:.o=.c)))
diff --git a/lib/nss_wrapper/config.mk b/lib/nss_wrapper/config.mk
deleted file mode 100644 (file)
index 015fbe5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################
-# Start SUBSYSTEM NSS_WRAPPER
-[SUBSYSTEM::NSS_WRAPPER]
-# End SUBSYSTEM NSS_WRAPPER
-##############################
-
-NSS_WRAPPER_OBJ_FILES = $(nsswrappersrcdir)/nss_wrapper.o
diff --git a/lib/popt/config.mk b/lib/popt/config.mk
deleted file mode 100644 (file)
index 04cc2c7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBPOPT]
-CFLAGS = -I$(poptsrcdir)
-
-LIBPOPT_OBJ_FILES = $(addprefix $(poptsrcdir)/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
-
diff --git a/lib/smbconf/config.mk b/lib/smbconf/config.mk
deleted file mode 100644 (file)
index de66b90..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[SUBSYSTEM::LIBSMBCONF]
-
-LIBSMBCONF_OBJ_FILES = $(addprefix ../lib/smbconf/, smbconf.o smbconf_txt.o smbconf_util.o)
diff --git a/lib/socket_wrapper/config.mk b/lib/socket_wrapper/config.mk
deleted file mode 100644 (file)
index 60cfb32..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-##############################
-# Start SUBSYSTEM SOCKET_WRAPPER
-[SUBSYSTEM::SOCKET_WRAPPER]
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-# End SUBSYSTEM SOCKET_WRAPPER
-##############################
-
-SOCKET_WRAPPER_OBJ_FILES = $(socketwrappersrcdir)/socket_wrapper.o
diff --git a/lib/talloc/config.mk b/lib/talloc/config.mk
deleted file mode 100644 (file)
index 5cdf3a1..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[LIBRARY::LIBTALLOC]
-OUTPUT_TYPE = MERGED_OBJ
-CFLAGS = -I$(tallocsrcdir)
-
-LIBTALLOC_OBJ_FILES = $(tallocsrcdir)/talloc.o
-
-MANPAGES += $(tallocdir)/talloc.3
diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk
deleted file mode 100644 (file)
index 22caada..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBTDB
-[LIBRARY::LIBTDB]
-OUTPUT_TYPE = MERGED_OBJ
-CFLAGS = -I$(tdbsrcdir)/include
-#
-# End SUBSYSTEM ldb
-################################################
-
-LIBTDB_OBJ_FILES = $(addprefix $(tdbsrcdir)/common/, \
-       tdb.o dump.o io.o lock.o \
-       open.o traverse.o freelist.o \
-       error.o transaction.o check.o)
-
-################################################
-# Start BINARY tdbtool
-[BINARY::tdbtool]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBTDB
-# End BINARY tdbtool
-################################################
-
-tdbtool_OBJ_FILES = $(tdbsrcdir)/tools/tdbtool.o
-
-################################################
-# Start BINARY tdbtorture
-[BINARY::tdbtorture]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBTDB
-# End BINARY tdbtorture
-################################################
-
-tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
-
-################################################
-# Start BINARY tdbrestore
-[BINARY::tdbrestore]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBTDB
-# End BINARY tdbrestore
-################################################
-
-################################################
-# Start BINARY tdbdump
-[BINARY::tdbdump]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBTDB
-# End BINARY tdbdump
-################################################
-
-tdbdump_OBJ_FILES = $(tdbsrcdir)/tools/tdbdump.o
-
-################################################
-# Start BINARY tdbbackup
-[BINARY::tdbbackup]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBTDB
-# End BINARY tdbbackup
-################################################
-
-tdbbackup_OBJ_FILES = $(tdbsrcdir)/tools/tdbbackup.o
diff --git a/lib/tdr/config.mk b/lib/tdr/config.mk
deleted file mode 100644 (file)
index 07506ec..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[SUBSYSTEM::TDR]
-CFLAGS = -Ilib/tdr
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
-
-TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o
-
-$(eval $(call proto_header_template,$(libtdrsrcdir)/tdr_proto.h,$(TDR_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += $(libtdrsrcdir)/tdr.h
diff --git a/lib/torture/config.mk b/lib/torture/config.mk
deleted file mode 100644 (file)
index b4ad9ae..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# TORTURE subsystem
-[LIBRARY::torture]
-PUBLIC_DEPENDENCIES = \
-               LIBSAMBA-HOSTCONFIG \
-               LIBSAMBA-UTIL \
-               LIBSAMBA-ERRORS \
-               LIBTALLOC \
-               LIBTEVENT
-CFLAGS = -I$(libtorturesrcdir) -I$(libtorturesrcdir)/../
-
-torture_VERSION = 0.0.1
-torture_SOVERSION = 0
-
-PC_FILES += $(libtorturesrcdir)/torture.pc
-torture_OBJ_FILES = $(addprefix $(libtorturesrcdir)/, torture.o subunit.o)
-
-PUBLIC_HEADERS += $(libtorturesrcdir)/torture.h
diff --git a/lib/tsocket/config.mk b/lib/tsocket/config.mk
deleted file mode 100644 (file)
index ca2978a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[SUBSYSTEM::LIBTSOCKET]
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBTEVENT
-
-LIBTSOCKET_OBJ_FILES = $(addprefix ../lib/tsocket/, \
-                                       tsocket.o \
-                                       tsocket_helpers.o \
-                                       tsocket_bsd.o)
-
-PUBLIC_HEADERS += $(addprefix ../lib/tsocket/, \
-                                tsocket.h\
-                                tsocket_internal.h)
-
diff --git a/lib/uid_wrapper/config.mk b/lib/uid_wrapper/config.mk
deleted file mode 100644 (file)
index 1bebc68..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-##############################
-# Start SUBSYSTEM UID_WRAPPER
-[SUBSYSTEM::UID_WRAPPER]
-PRIVATE_DEPENDENCIES = LIBTALLOC
-# End SUBSYSTEM UID_WRAPPER
-##############################
-
-UID_WRAPPER_OBJ_FILES = $(uidwrappersrcdir)/uid_wrapper.o
-
diff --git a/lib/util/capability.m4 b/lib/util/capability.m4
deleted file mode 100644 (file)
index 2a95a60..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-AC_CACHE_CHECK([for irix specific capabilities],samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES,[
-AC_TRY_RUN([#include <sys/types.h>
-#include <sys/capability.h>
-main() {
- cap_t cap;
- if ((cap = cap_get_proc()) == NULL)
-   exit(1);
- cap->cap_effective |= CAP_NETWORK_MGT;
- cap->cap_inheritable |= CAP_NETWORK_MGT;
- cap_set_proc(cap);
- exit(0);
-}
-],
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross)])
-if test x"$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" = x"yes"; then
-    AC_DEFINE(HAVE_IRIX_SPECIFIC_CAPABILITIES,1,[Whether IRIX specific capabilities are available])
-fi
diff --git a/lib/util/charset/config.m4 b/lib/util/charset/config.m4
deleted file mode 100644 (file)
index 453de9f..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl SMB_CHECK_ICONV(hdr, msg, action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV,[
-  AC_MSG_CHECKING($2)
-  AC_TRY_RUN([#include <stdlib.h>
-#include <$1>
-
-int main()
-{
-   iconv_t cd = iconv_open("ASCII","UCS-2LE");
-   if (cd == 0 || cd == (iconv_t)-1) return -1;
-   return 0;
-} 
-   ],
-   [AC_MSG_RESULT(yes); $3],
-   [AC_MSG_RESULT(no); $4],
-   [AC_MSG_RESULT(cross); $4])
-])
-
-dnl SMB_CHECK_ICONV_DIR(dir,action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV_DIR,
-[
-       save_CPPFLAGS="$CPPFLAGS"
-       save_LDFLAGS="$LDFLAGS"
-       save_LIBS="$LIBS"
-       CPPFLAGS="-I$1/include"
-       LDFLAGS="-L$1/lib"
-       LIBS=-liconv
-
-       SMB_CHECK_ICONV(iconv.h,Whether iconv.h is present,[ AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) $2 ], [
-        LIBS=-lgiconv
-        SMB_CHECK_ICONV(giconv.h,Whether giconv.h is present, [AC_DEFINE(HAVE_GICONV_H,1,[Whether giconv.h is present]) $2],[$3])
-       ])
-
-       CPPFLAGS="$save_CPPFLAGS"
-       LDFLAGS="$save_LDFLAGS"
-       LIBS="$save_LIBS"
-])
-
-ICONV_FOUND=no
-LOOK_DIRS="/usr /usr/local /sw"
-AC_ARG_WITH(libiconv,
-[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
-[
-  if test "$withval" = "no" ; then
-    AC_MSG_ERROR(I won't take no for an answer)
-  else
-     if test "$withval" != "yes" ; then
-       SMB_CHECK_ICONV_DIR($withval, [
-               ICONV_FOUND=yes; 
-               ICONV_CPPFLAGS="$CPPFLAGS"
-               ICONV_LIBS="$LIBS"
-               ICONV_LDFLAGS="$LDFLAGS"
-               ], [AC_MSG_ERROR([No iconv library found in $withval])])
-     fi
-  fi
-])
-
-if test x$ICONV_FOUND = xno; then
-       SMB_CHECK_ICONV(iconv.h,
-               [Whether iconv.h is present], 
-               [AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) ICONV_FOUND=yes])
-fi
-
-for i in $LOOK_DIRS ; do
-       if test x$ICONV_FOUND = xyes; then
-               break
-       fi
-       
-       SMB_CHECK_ICONV_DIR($i, [
-               ICONV_FOUND=yes
-               ICONV_CPPFLAGS="$CPPFLAGS"
-               ICONV_LIBS="$LIBS"
-               ICONV_LDFLAGS="$LDFLAGS"
-               ], [])
-done
-
-if test x"$ICONV_FOUND" = x"no"; then 
-    AC_MSG_WARN([Sufficient support for iconv function was not found. 
-    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!])
-       SMB_ENABLE(ICONV,NO)
-else
-       AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether external iconv is available])
-       SMB_ENABLE(ICONV,YES)
-fi
-
-SMB_EXT_LIB(ICONV,[${ICONV_LIBS}],[${ICONV_CFLAGS}],[${ICONV_CPPFLAGS}],[${ICONV_LDFLAGS}])
diff --git a/lib/util/charset/config.mk b/lib/util/charset/config.mk
deleted file mode 100644 (file)
index 952c13a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################
-# Start SUBSYSTEM CHARSET
-[SUBSYSTEM::CHARSET]
-PUBLIC_DEPENDENCIES = ICONV
-PRIVATE_DEPENDENCIES = DYNCONFIG
-# End SUBSYSTEM CHARSET
-################################################
-
-CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o codepoints.o)
-
-PUBLIC_HEADERS += $(libcharsetsrcdir)/charset.h
diff --git a/lib/util/config.mk b/lib/util/config.mk
deleted file mode 100644 (file)
index 719f5f2..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-[LIBRARY::LIBSAMBA-UTIL]
-PUBLIC_DEPENDENCIES = \
-               LIBTALLOC LIBCRYPTO \
-               SOCKET_WRAPPER LIBREPLACE_NETWORK \
-               CHARSET EXECINFO UID_WRAPPER
-
-LIBSAMBA-UTIL_VERSION = 0.0.1
-LIBSAMBA-UTIL_SOVERSION = 0
-
-LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
-               xfile.o \
-               debug.o \
-               fault.o \
-               signal.o \
-               system.o \
-               time.o \
-               genrand.o \
-               dprintf.o \
-               util_str.o \
-               rfc1738.o \
-               substitute.o \
-               util_strlist.o \
-               util_file.o \
-               data_blob.o \
-               util.o \
-               blocking.o \
-               util_net.o \
-               fsusage.o \
-               ms_fnmatch.o \
-               mutex.o \
-               idtree.o \
-               become_daemon.o \
-               rbtree.o \
-               talloc_stack.o \
-               smb_threads.o \
-               params.o \
-               parmlist.o \
-               util_id.o
-               select.o)
-
-PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
-                                dlinklist.h \
-                                attr.h \
-                                byteorder.h \
-                                data_blob.h \
-                                debug.h \
-                                memory.h \
-                                mutex.h \
-                                safe_string.h \
-                                time.h \
-                                util_ldb.h \
-                                talloc_stack.h \
-                                tevent_ntstatus.h \
-                                tevent_unix.h  \
-                                xfile.h)
-
-[SUBSYSTEM::ASN1_UTIL]
-
-ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
-
-[SUBSYSTEM::UNIX_PRIVS]
-PRIVATE_DEPENDENCIES = UID_WRAPPER
-
-UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o
-
-$(eval $(call proto_header_template,$(libutilsrcdir)/unix_privs.h,$(UNIX_PRIVS_OBJ_FILES:.o=.c)))
-
-################################################
-# Start SUBSYSTEM WRAP_XATTR
-[SUBSYSTEM::WRAP_XATTR]
-PUBLIC_DEPENDENCIES = XATTR
-#
-# End SUBSYSTEM WRAP_XATTR
-################################################
-
-WRAP_XATTR_OBJ_FILES = $(libutilsrcdir)/wrap_xattr.o
-
-[SUBSYSTEM::UTIL_TDB]
-PUBLIC_DEPENDENCIES = LIBTDB
-
-UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o
-
-[SUBSYSTEM::UTIL_TEVENT]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-
-UTIL_TEVENT_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
-                       tevent_unix.o \
-                       tevent_ntstatus.o)
-
-[SUBSYSTEM::UTIL_LDB]
-PUBLIC_DEPENDENCIES = LIBLDB
-
-UTIL_LDB_OBJ_FILES = $(libutilsrcdir)/util_ldb.o
-
-[SUBSYSTEM::UTIL_RUNCMD]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-
-UTIL_RUNCMD_OBJ_FILES = $(libutilsrcdir)/util_runcmd.o
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
deleted file mode 100644 (file)
index c229769..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_CHECK_HEADERS(execinfo.h)
-AC_SEARCH_LIBS_EXT(backtrace, [execinfo], EXECINFO_LIBS)
-AC_CHECK_FUNC_EXT(backtrace, $EXECINFO_LIBS)
-
-
-if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
-       SMB_ENABLE(EXECINFO, YES)
-       EXECINFO_CFLAGS="$CFLAGS"
-       EXECINFO_CPPFLAGS="$CPPFLAGS"
-       EXECINFO_LDFLAGS="$LDFLAGS"
-       LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
-       CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CFLAGS)
-       CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CPPFLAGS)
-else
-       SMB_ENABLE(EXECINFO,NO)
-fi
-
-SMB_EXT_LIB(EXECINFO, [${EXECINFO_LIBS}], [${EXECINFO_CFLAGS}], [${EXECINFO_CPPFLAGS}], [${EXECINFO_LDFLAGS}])
diff --git a/lib/util/fsusage.m4 b/lib/util/fsusage.m4
deleted file mode 100644 (file)
index 8439650..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-#################################################
-# these tests are taken from the GNU fileutils package
-AC_CHECKING(how to get filesystem space usage)
-AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h sys/vfs.h)
-
-AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif])
-
-space=no
-
-# Test for statvfs64.
-if test $space = no; then
-  # SVR4
-  AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64,
-  [AC_TRY_RUN([
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/statvfs.h>
-  main ()
-  {
-    struct statvfs64 fsd;
-    exit (statvfs64 (".", &fsd));
-  }],
-  fu_cv_sys_stat_statvfs64=yes,
-  fu_cv_sys_stat_statvfs64=no,
-  fu_cv_sys_stat_statvfs64=cross)])
-  if test $fu_cv_sys_stat_statvfs64 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATVFS64,1,[Whether statvfs64() is available])
-  fi
-fi
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $space = no; then
-  # SVR4
-  AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-                [AC_TRY_LINK([#include <sys/types.h>
-#include <sys/statvfs.h>],
-                             [struct statvfs fsd; statvfs (0, &fsd);],
-                             fu_cv_sys_stat_statvfs=yes,
-                             fu_cv_sys_stat_statvfs=no)])
-  if test $fu_cv_sys_stat_statvfs = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATVFS,1,[Whether statvfs() is available])
-  fi
-fi
-
-# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
-# systems use f_bsize.
-AC_CACHE_CHECK([that statvfs.f_frsize works],samba_cv_frsize, [
-    AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/statvfs.h>],[struct statvfs buf; buf.f_frsize = 0],
-       samba_cv_frsize=yes,samba_cv_frsize=no)])
-if test x"$samba_cv_frsize" = x"yes"; then
-    AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
-fi
-
-if test $space = no; then
-  # DEC Alpha running OSF/1
-  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-  [AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-  main ()
-  {
-    struct statfs fsd;
-    fsd.f_fsize = 0;
-    exit (statfs (".", &fsd, sizeof (struct statfs)));
-  }],
-  fu_cv_sys_stat_statfs3_osf1=yes,
-  fu_cv_sys_stat_statfs3_osf1=no,
-  fu_cv_sys_stat_statfs3_osf1=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS3_OSF1,1,[Whether statfs requires 3 arguments])
-  fi
-fi
-
-if test $space = no; then
-# AIX
-  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-  [AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_bsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_bsize=yes,
-  fu_cv_sys_stat_statfs2_bsize=no,
-  fu_cv_sys_stat_statfs2_bsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_BSIZE,1,[Whether statfs requires two arguments and struct statfs has bsize property])
-  fi
-fi
-
-if test $space = no; then
-# SVR3
-  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-  [AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-  main ()
-  {
-  struct statfs fsd;
-  exit (statfs (".", &fsd, sizeof fsd, 0));
-  }],
-    fu_cv_sys_stat_statfs4=yes,
-    fu_cv_sys_stat_statfs4=no,
-    fu_cv_sys_stat_statfs4=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-  if test $fu_cv_sys_stat_statfs4 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS4,1,[Whether statfs requires 4 arguments])
-  fi
-fi
-
-if test $space = no; then
-# 4.4BSD and NetBSD
-  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_fsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_fsize=yes,
-  fu_cv_sys_stat_statfs2_fsize=no,
-  fu_cv_sys_stat_statfs2_fsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-    space=yes
-       AC_DEFINE(STAT_STATFS2_FSIZE,1,[Whether statfs requires 2 arguments and struct statfs has fsize])
-  fi
-fi
-
-if test $space = no; then
-  # Ultrix
-  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-  main ()
-  {
-  struct fs_data fsd;
-  /* Ultrix's statfs returns 1 for success,
-     0 for not mounted, -1 for failure.  */
-  exit (statfs (".", &fsd) != 1);
-  }],
-  fu_cv_sys_stat_fs_data=yes,
-  fu_cv_sys_stat_fs_data=no,
-  fu_cv_sys_stat_fs_data=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-  if test $fu_cv_sys_stat_fs_data = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and struct fs_data is available])
-  fi
-fi
diff --git a/lib/util/signal.m4 b/lib/util/signal.m4
deleted file mode 100644 (file)
index c6d7f72..0000000
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(sigprocmask sigblock sigaction)
diff --git a/lib/util/util.m4 b/lib/util/util.m4
deleted file mode 100644 (file)
index 9e36295..0000000
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(setsid)
diff --git a/lib/util/xattr.m4 b/lib/util/xattr.m4
deleted file mode 100644 (file)
index 497809a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl ############################################
-dnl use flistxattr as the key function for having 
-dnl sufficient xattr support for posix xattr backend
-AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h)
-AC_SEARCH_LIBS_EXT(flistxattr, [attr], XATTR_LIBS)
-AC_CHECK_FUNC_EXT(flistxattr, $XATTR_LIBS)
-SMB_EXT_LIB(XATTR,[${XATTR_LIBS}],[${XATTR_CFLAGS}],[${XATTR_CPPFLAGS}],[${XATTR_LDFLAGS}])
-if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
-       AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt,
-       [old_LIBS=$LIBS
-        LIBS="$LIBS $XATTRLIBS"
-        AC_TRY_COMPILE([
-               #include <sys/types.h>
-               #if HAVE_ATTR_XATTR_H
-               #include <attr/xattr.h>
-               #elif HAVE_SYS_XATTR_H
-               #include <sys/xattr.h>
-               #endif
-               #ifndef NULL
-               #define NULL ((void *)0)
-               #endif
-               ],[
-               getxattr(NULL, NULL, NULL, 0, 0, 0);
-               ],smb_attr_cv_xattr_add_opt=yes,smb_attr_cv_xattr_add_opt=no)
-         LIBS=$old_LIBS])
-       if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
-               AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [xattr functions have additional options])
-       fi
-       AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support])
-       SMB_ENABLE(XATTR,YES)
-fi
-
diff --git a/libcli/auth/config.mk b/libcli/auth/config.mk
deleted file mode 100644 (file)
index bc198f3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[SUBSYSTEM::ntlm_check]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-
-ntlm_check_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, ntlm_check.o)
-
-[SUBSYSTEM::MSRPC_PARSE]
-
-MSRPC_PARSE_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, msrpc_parse.o)
-
-[SUBSYSTEM::LIBCLI_AUTH]
-PUBLIC_DEPENDENCIES = \
-               MSRPC_PARSE \
-               LIBSAMBA-HOSTCONFIG
-
-LIBCLI_AUTH_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, \
-               credentials.o \
-               session.o \
-               smbencrypt.o \
-               smbdes.o)
-
-PUBLIC_HEADERS += ../libcli/auth/credentials.h
-
-[SUBSYSTEM::COMMON_SCHANNELDB]
-PRIVATE_DEPENDENCIES = TDB_WRAP
-
-COMMON_SCHANNELDB_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, schannel_state_tdb.o)
diff --git a/libcli/cldap/config.mk b/libcli/cldap/config.mk
deleted file mode 100644 (file)
index a4a75b4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[SUBSYSTEM::LIBCLI_CLDAP]
-PUBLIC_DEPENDENCIES = LIBCLI_LDAP
-PRIVATE_DEPENDENCIES = LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT LIBLDB LIBCLI_NETLOGON
-
-LIBCLI_CLDAP_OBJ_FILES = ../libcli/cldap/cldap.o
-# PUBLIC_HEADERS += ../libcli/cldap/cldap.h
-
diff --git a/libcli/drsuapi/config.mk b/libcli/drsuapi/config.mk
deleted file mode 100644 (file)
index 4c68702..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[SUBSYSTEM::LIBCLI_DRSUAPI]
-PUBLIC_DEPENDENCIES = \
-               LIBCLI_AUTH
-
-LIBCLI_DRSUAPI_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/drsuapi/, \
-               repl_decrypt.o)
diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
deleted file mode 100644 (file)
index 22cad8c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[SUBSYSTEM::LIBCLI_LDAP_MESSAGE]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBLDB
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ASN1_UTIL
-
-LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix ../libcli/ldap/, \
-                                               ldap_message.o)
-PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h ../libcli/ldap/ldap_errors.h
-
-[SUBSYSTEM::LIBCLI_LDAP_NDR]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB NDR_MISC NDR_SECURITY
-
-LIBCLI_LDAP_NDR_OBJ_FILES = ../libcli/ldap/ldap_ndr.o
-PUBLIC_HEADERS += ../libcli/ldap/ldap_ndr.h
-
diff --git a/libcli/named_pipe_auth/config.mk b/libcli/named_pipe_auth/config.mk
deleted file mode 100644 (file)
index 6d44ef4..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::NAMED_PIPE_AUTH_TSTREAM]
-PUBLIC_DEPENDENCIES = NDR_NAMED_PIPE_AUTH TEVENT TSOCKET
-
-NAMED_PIPE_AUTH_TSTREAM_OBJ_FILES = ../libcli/named_pipe_auth/npa_tstream.o
diff --git a/libcli/nbt/config.mk b/libcli/nbt/config.mk
deleted file mode 100644 (file)
index 14af80e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[SUBSYSTEM::NDR_NBT_BUF]
-
-NDR_NBT_BUF_OBJ_FILES = $(libclinbtsrcdir)/nbtname.o
-
-$(eval $(call proto_header_template,$(libclinbtsrcdir)/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::LIBCLI_NBT]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
-       NDR_SECURITY samba_socket LIBSAMBA-UTIL
-
-LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \
-       lmhosts.o \
-       dns_hosts_file.o \
-       nbtsocket.o \
-       namequery.o \
-       nameregister.o \
-       namerefresh.o \
-       namerelease.o)
-
-[BINARY::nmblookup]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-HOSTCONFIG \
-               LIBSAMBA-UTIL \
-               LIBCLI_NBT \
-               LIBPOPT \
-               POPT_SAMBA \
-               LIBNETIF \
-               LIBCLI_RESOLVE
-
-nmblookup_OBJ_FILES = $(libclinbtsrcdir)/tools/nmblookup.o
-MANPAGES += $(libclinbtsrcdir)/man/nmblookup.1
-
-[SUBSYSTEM::LIBCLI_NDR_NETLOGON]
-PUBLIC_DEPENDENCIES = LIBNDR  \
-       NDR_SECURITY    
-
-LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/../, ndr_netlogon.o)
-
-[SUBSYSTEM::LIBCLI_NETLOGON]
-PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON
-
-LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \
-       ../netlogon.o)
-
-[PYTHON::python_netbios]
-LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
-
-python_netbios_OBJ_FILES = $(libclinbtsrcdir)/pynbt.o
-
diff --git a/libcli/samsync/config.mk b/libcli/samsync/config.mk
deleted file mode 100644 (file)
index bea909e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[SUBSYSTEM::LIBCLI_SAMSYNC]
-PUBLIC_DEPENDENCIES = \
-               LIBCLI_AUTH
-
-LIBCLI_SAMSYNC_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/samsync/, \
-               decrypt.o)
diff --git a/libcli/security/config.mk b/libcli/security/config.mk
deleted file mode 100644 (file)
index 2a0ce05..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBSECURITY_COMMON]
-PRIVATE_DEPENDENCIES = TALLOC
-
-LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \
-                                       dom_sid.o display_sec.o secace.o secacl.o security_descriptor.o sddl.o)
diff --git a/libcli/smb/config.mk b/libcli/smb/config.mk
deleted file mode 100644 (file)
index 57c25c3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# common SMB and SMB2 stuff
-[SUBSYSTEM::LIBCLI_SMB_COMMON]
-PUBLIC_DEPENDENCIES = LIBTALLOC
-
-LIBCLI_SMB_COMMON_OBJ_FILES = $(addprefix ../libcli/smb/, \
-               smb2_create_blob.o)
-
-$(eval $(call proto_header_template, \
-       ../libcli/smb/smb_common_proto.h, \
-       $(LIBCLI_SMB_COMMON_OBJ_FILES:.o=.c)))
-
diff --git a/libcli/smbreadline/readline.m4 b/libcli/smbreadline/readline.m4
deleted file mode 100644 (file)
index f450cac..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################
-# Readline included by default unless explicitly asked not to
-test "${with_readline+set}" != "set" && with_readline=yes
-
-EXTERNAL_READLINE=no
-# test for where we get readline() from
-AC_MSG_CHECKING(whether to use readline)
-AC_ARG_WITH(readline,
-[AS_HELP_STRING([--with-readline[=DIR]], [Look for readline include/libs in DIR (default=auto)])],
-[  case "$with_readline" in
-  yes)
-    AC_MSG_RESULT(yes)
-
-    AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-    AC_CHECK_HEADERS(readline/history.h)
-
-    AC_CHECK_HEADERS(readline.h readline/readline.h,[
-      for termlib in ncurses curses termcap terminfo termlib tinfo; do
-       AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
-      done
-      AC_CHECK_LIB(readline, rl_callback_handler_install,
-       [TERMLIBS="-lreadline $TERMLIBS"
-       EXTERNAL_READLINE=yes
-       break], [TERMLIBS=], $TERMLIBS)])
-    ;;
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-
-    # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-    # alternate readline path
-    _ldflags=${LDFLAGS}
-    _cppflags=${CPPFLAGS}
-
-    # Add additional search path
-    LDFLAGS="-L$with_readline/lib $LDFLAGS"
-    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-
-    AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-    AC_CHECK_HEADERS(readline/history.h)
-
-    AC_CHECK_HEADERS(readline.h readline/readline.h,[
-      for termlib in ncurses curses termcap terminfo termlib; do
-       AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
-      done
-      AC_CHECK_LIB(readline, rl_callback_handler_install,
-       [TERMLDFLAGS="-L$with_readline/lib"
-       TERMCPPFLAGS="-I$with_readline/include"
-       LDFLAGS="-L$with_readline/lib $LDFLAGS"
-       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-       TERMLIBS="-lreadline $TERMLIBS"
-       EXTERNAL_READLINE=yes
-       break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)])
-
-    ;;
-  esac],
-  AC_MSG_RESULT(no)
-)
-
-# The readline API changed slightly from readline3 to readline4, so
-# code will generate warnings on one of them unless we have a few
-# special cases.
-AC_CHECK_LIB(readline, rl_completion_matches,
-            [AC_DEFINE(HAVE_NEW_LIBREADLINE, 1,
-                       [Do we have rl_completion_matches?])],
-            [],
-            [$TERMLIBS])
-
-# not all readline libs have rl_event_hook or history_list
-AC_CHECK_DECLS(rl_event_hook, [], [], [
-    #include <stdio.h>
-    #include <readline/readline.h>
-])
-AC_CHECK_LIB(readline, history_list,
-            [AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])],
-            [],
-            [$TERMLIBS])
-
-AC_CHECK_LIB(readline, add_history,
-            [AC_DEFINE(HAVE_ADD_HISTORY, 1, [Do we have add_history?])],
-            [],
-            [$TERMLIBS])
-
-AC_MSG_CHECKING(whether to use extern readline)
-if test x"$EXTERNAL_READLINE" = x"yes"; then
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-       SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [READLINE])
-       SMB_EXT_LIB(READLINE, [${TERMLIBS}])
-       SMB_ENABLE(READLINE,YES)
-else
-       SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [])
-       AC_MSG_RESULT(no)
-fi
diff --git a/libgpo/config.mk b/libgpo/config.mk
deleted file mode 100644 (file)
index 6472d16..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[SUBSYSTEM::LIBGPO]
-PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
-
-LIBGPO_OBJ_FILES = ../libgpo/gpo_util.o ../libgpo/gpo_sec.o \
-                                  ../libgpo/gpext/gpext.o \
-                                  ../libgpo/gpo_fetch.o ../libgpo/gpo_ini.o \
-                       $(libgpodir)/ads_convenience.o $(libgpodir)/gpo_filesync.o
diff --git a/nsswitch/config.m4 b/nsswitch/config.m4
deleted file mode 100644 (file)
index 8966e35..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-######
-AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h )
-
-case "$host_os" in
-       *linux*)
-           if test x"$MERGED_BUILD" != x"1"; then
-               SMB_BUILD_LIBRARY(nss_winbind,
-                           [../nsswitch/winbind_nss_linux.o],
-                           [LIBWINBIND-CLIENT])
-               SMB_MAKE_SETTINGS([nss_winbind_VERSION = 2])
-               SMB_MAKE_SETTINGS([nss_winbind_SOVERSION = 2])
-           fi
-       ;;
-       *)
-       ;;
-esac
-#####
-
-#####
-#All the pam requirement tests are regrouped here
-#It is mandatory not to remove them otherwise it will break badly the source4/auth part
-AC_CHECK_HEADERS(security/pam_appl.h)
-AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_start)
-# This part is need for the compilation
-AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h,,,[[
-    #if HAVE_SECURITY_PAM_APPL_H
-    #include <security/pam_appl.h>
-    #endif
-    #if HAVE_PAM_PAM_APPL_H
-    #include <pam/pam_appl.h>
-    #endif
-]])
-
-SMB_EXT_LIB(PAM, $PAM_LIBS)
-
-if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then
-       SMB_ENABLE(PAM,YES)
-       if test x"$MERGED_BUILD" != x"1"; then
-               SMB_BUILD_LIBRARY(pam_winbind,[../nsswitch/pam_winbind.o],
-                                 [LIBWBCLIENT LIBWINBIND-CLIENT LIBINIPARSER PAM],
-                                 [-DLOCALEDIR=\\\"${datarootdir}/locale\\\"],
-                                 [],
-                                 [../nsswitch/pam_winbind.\$(SHLIBEXT)])
-       fi
-fi
-#####
diff --git a/nsswitch/config.mk b/nsswitch/config.mk
deleted file mode 100644 (file)
index 8654d96..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[SUBSYSTEM::LIBWINBIND-CLIENT]
-
-LIBWINBIND-CLIENT_OBJ_FILES = $(nsswitchsrcdir)/wb_common.o
-$(LIBWINBIND-CLIENT_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" -DSOCKET_WRAPPER_DISABLE=1
-
-#################################
-# Start BINARY nsstest
-[BINARY::nsstest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-UTIL \
-               LIBREPLACE_EXT \
-               LIBSAMBA-HOSTCONFIG \
-               NSS_WRAPPER
-# End BINARY nsstest
-#################################
-
-nsstest_OBJ_FILES = $(nsswitchsrcdir)/nsstest.o
-
-#################################
-# Start BINARY wbinfo
-[BINARY::wbinfo]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-UTIL \
-               LIBREPLACE_EXT \
-               LIBCLI_AUTH \
-               LIBPOPT \
-               POPT_SAMBA \
-               LIBWINBIND-CLIENT \
-               LIBWBCLIENT \
-               LIBTEVENT \
-               UTIL_TEVENT \
-               LIBASYNC_REQ \
-               UID_WRAPPER
-# End BINARY nsstest
-#################################
-
-wbinfo_OBJ_FILES = \
-               $(nsswitchsrcdir)/wbinfo.o
-$(wbinfo_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
diff --git a/nsswitch/libwbclient/config.mk b/nsswitch/libwbclient/config.mk
deleted file mode 100644 (file)
index 2b7b0f4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[SUBSYSTEM::LIBWBCLIENT]
-PUBLIC_DEPENDENCIES = LIBTALLOC
-
-LIBWBCLIENT_OBJ_FILES = $(addprefix $(libwbclientsrcdir)/, wbc_guid.o \
-                                                               wbc_idmap.o \
-                                                               wbclient.o \
-                                                               wbc_pam.o \
-                                                               wbc_pwd.o \
-                                                               wbc_sid.o \
-                                                               wbc_util.o )
diff --git a/nsswitch/nsstest.m4 b/nsswitch/nsstest.m4
deleted file mode 100644 (file)
index 3759648..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-case "$host_os" in
-       *linux*)
-               SMB_ENABLE(nsstest,YES)
-       ;;
-       *)
-               SMB_ENABLE(nsstest,NO)
-       ;;
-esac
diff --git a/pidl/config.m4 b/pidl/config.m4
deleted file mode 100644 (file)
index 8b8bc5a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Check whether ExtUtils::ExtMaker is available
-
-if perl -e "use ExtUtils::MakeMaker" 2>/dev/null; then
-       HAVE_PERL_EXTUTILS_MAKEMAKER=1
-else
-       HAVE_PERL_EXTUTILS_MAKEMAKER=0
-fi
-
-AC_SUBST(HAVE_PERL_EXTUTILS_MAKEMAKER)
diff --git a/pidl/config.mk b/pidl/config.mk
deleted file mode 100644 (file)
index d7a84e3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-PIDL = $(PERL) $(pidldir)/pidl
-
-$(pidldir)/Makefile: $(pidldir)/Makefile.PL
-       @cd $(pidldir) && $(PERL) Makefile.PL PREFIX=$(prefix)
-
-pidl-testcov: $(pidldir)/Makefile
-       cd $(pidldir) && cover -test
-
-installpidl:: $(pidldir)/Makefile
-       @$(MAKE) -C $(pidldir) install_vendor VENDORPREFIX=$(prefix) \
-                                          INSTALLVENDORLIB=$(datarootdir)/perl5 \
-                                                                  INSTALLVENDORBIN=$(bindir) \
-                                                                  INSTALLVENDORSCRIPT=$(bindir) \
-                                                                  INSTALLVENDORMAN1DIR=$(mandir)/man1 \
-                                                                  INSTALLVENDORMAN3DIR=$(mandir)/man3
-
-ifeq ($(HAVE_PERL_EXTUTILS_MAKEMAKER),1)
-install:: installpidl
-endif
-
-$(pidldir)/lib/Parse/Pidl/IDL.pm: $(pidldir)/idl.yp
-       -$(YAPP) -m 'Parse::Pidl::IDL' -o $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/idl.yp ||\
-               touch $(pidldir)/lib/Parse/Pidl/IDL.pm 
-
-$(pidldir)/lib/Parse/Pidl/Expr.pm: $(pidldir)/idl.yp
-       -$(YAPP) -m 'Parse::Pidl::Expr' -o $(pidldir)/lib/Parse/Pidl/Expr.pm $(pidldir)/expr.yp ||\
-               touch $(pidldir)/lib/Parse/Pidl/Expr.pm 
-
-testcov-html:: pidl-testcov
-
-pidl-clean:
-       /bin/rm -f $(pidldir)/Makefile
-
-clean:: pidl-clean
diff --git a/source4/Makefile.in b/source4/Makefile.in
deleted file mode 100644 (file)
index 7c4f141..0000000
+++ /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 (file)
index 8ad8f47..0000000
+++ /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 (file)
index 03fdadb..0000000
+++ /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 (file)
index 573f197..0000000
+++ /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 (file)
index 2d35180..0000000
+++ /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 (file)
index b945afe..0000000
+++ /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 (file)
index 6e86aab..0000000
+++ /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 (file)
index a8d55a1..0000000
+++ /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 (file)
index 609b036..0000000
+++ /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 (file)
index 6c75ae8..0000000
+++ /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 (file)
index 1be5fa9..0000000
+++ /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 (executable)
index 22e35e0..0000000
+++ /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 (file)
index ec01a00..0000000
+++ /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 (file)
index f7fe2a1..0000000
+++ /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 (file)
index 8149a8f..0000000
+++ /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 (file)
index 2aaf959..0000000
+++ /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 (file)
index 48d6b33..0000000
+++ /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 (file)
index fb6b8aa..0000000
+++ /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 (file)
index 738ab8b..0000000
+++ /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 (file)
index c08e2e7..0000000
+++ /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 (executable)
index d05056d..0000000
+++ /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 (file)
index ea307da..0000000
+++ /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 (file)
index 30622cc..0000000
+++ /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 (file)
index 12a606c..0000000
+++ /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 (executable)
index ac4afea..0000000
+++ /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 (file)
index eac3905..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-The Samba Build System\r
-======================\r
-\r
-The build system basically has two main parts: the autoconf-generated \r
-shell scripts which check for availability of functions and libraries \r
-which is stored in the .m4 files and the information about the various \r
-subsystems which is stored in the .mk files.\r
-\r
-Object Types\r
-------------\r
-the build system knows about the following object types\r
-\r
-SUBSYSTEM:\r
-       a SUBSYSTEM is basicly a collection of functions, which provide an\r
-       an generic API for a specific problem (e.g. libldb provides an api\r
-       for gneric ldb databases. libldb_plugin provides a generic api\r
-       for calling ldb plugins, so 'libldb' and 'libldb_plugin' are subsystems)\r
-\r
-MODULE:\r
-       a MODULE is a specify implementation of a API provided by a SUBSYSTEM.\r
-       (e.g. 'libldb_tdb' and 'libldb_ldap' are implementations of the subsystem 'libldb' API,\r
-        and 'libldb_plugin_timestamp' is a module of the 'libldb_plugin' subsystem)    \r
-\r
-EXT_LIB:\r
-       an EXT_LIB is an external library which is needed by a SUBSYSTEM, MODULE, BINARY or LIBRARY.\r
-       (e.g. 'gtk' or 'KRB5')\r
-\r
-BINARY:\r
-       a BINARY means a executable binary file.\r
-       (e.g. 'smbtorture' or 'ldbedit')\r
-       a BINARY typically has only commandline handling and basic \r
-       functionality code in it and depends on the functions of\r
-       SUBSYSTEM's (REQUIRED_SUBSYSTEMS).\r
-\r
-LIBRARY:\r
-       a LIBRARY means a static and/or shared library,\r
-       which depends on the used OS.\r
-       (e.g. for libldb 'libldb.so', 'libldb.so.0' 'libldb.so.0.0.1'\r
-             and libldb.a are created on linux)\r
-       a LIBRARY typicly has only glue code in it and depends on\r
-       SUBSYSTEM's (REQUIRED_SUBSYSTEMS).\r
-\r
-File summary:\r
--------------\r
-public.m4 - public M4 macros of the build system\r
-config_mk.pm - Support for reading .mk files \r
-dot.pm - Support for generating .dot files for analysis of dependencies\r
-input.pm - Input validation\r
-main.pm - Main\r
-makefile.pm - Makefile generation\r
-output.pm - Dependency calculation\r
-\r
-Layout\r
--------\r
-\r
-Toplevel file: configure.in\r
-- included by autogen.sh: aclocal.m4\r
-  which includes the SMB_YXZ*() macros\r
-\r
-- default tests of the build system\r
-  are in build/smb_build/check_*.m4\r
-  (mostly compiler and basic C type and function\r
-   checks)\r
-\r
-- subsystem specific stuff should be included by 'SMB_INCLUDE_M4()'\r
-\r
-\r
-Generating the configure file\r
--------------------------\r
-you need to rerun ./autogen.sh when 'configure.in' or any\r
-'.m4' file was modified, then you need to rerun configure.\r
-\r
-\r
-Generating config.status\r
------------------------------\r
-you need to run ./config.status (or 'configure') after a '.mk'\r
-file was changed.\r
-\r
-\r
-Examples\r
---------\r
-for now please take a look at the .m4 and .mk files\r
-you find in the source tree, they should be a good reference to start.\r
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
deleted file mode 100644 (file)
index adfe17d..0000000
+++ /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 (file)
index 8c7d752..0000000
+++ /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 (executable)
index b30c320..0000000
+++ /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 (file)
index 27a0089..0000000
+++ /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 (file)
index fbea269..0000000
+++ /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 (file)
index 3a6f4b7..0000000
+++ /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 (file)
index aada681..0000000
+++ /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 (file)
index 09f5ff8..0000000
+++ /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 (file)
index 49d2a1f..0000000
+++ /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 (file)
index 877544a..0000000
+++ /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 (file)
index bbf4518..0000000
+++ /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 (executable)
index da83314..0000000
+++ /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 (executable)
index a39437d..0000000
+++ /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
-               ;;
-      &n