auth/gensec: align common elements between gse_context and gensec_gssapi_state
[gd/samba-autobuild/.git] / source3 / wscript
index 1062b3a463955374fcea3e5189de0650ce074951..1a5a5c4b2390ef421313d217faad24644c8a454f 100644 (file)
@@ -1,31 +1,19 @@
 #! /usr/bin/env python
 
-srcdir = '..'
-blddir = 'bin'
-
-APPNAME='samba'
-VERSION=None
+srcdir=".."
 
 import sys, os
 from optparse import SUPPRESS_HELP
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 sys.path.insert(0, "source3")
-import wafsamba, Options, Logs, Utils
+import wafsamba, Options, Logs, Utils, Scripting
 import build.charset
 import samba_utils, samba_version
 import samba3
 
+Options.default_prefix = '/usr/local/samba'
+
 def set_options(opt):
-    if not os.getenv('TOPLEVEL_BUILD'):
-        opt.BUILTIN_DEFAULT('NONE')
-        opt.PRIVATE_EXTENSION_DEFAULT('s3')
-        opt.RECURSE('../lib/replace')
-        opt.RECURSE('build')
-        opt.RECURSE('selftest')
-        opt.RECURSE('../lib/nss_wrapper')
-        opt.RECURSE('../lib/socket_wrapper')
-        opt.RECURSE('../lib/tevent')
-        opt.RECURSE('../lib/tdb')
 
     opt.add_option('--with-static-modules',
                    help=("Comma-separated list of names of modules to statically link in"),
@@ -40,12 +28,12 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('winbind')
     opt.SAMBA3_ADD_OPTION('swat')
     opt.SAMBA3_ADD_OPTION('ads')
-    opt.SAMBA3_ADD_OPTION('krb5')
+    opt.SAMBA3_ADD_OPTION('mit-krb5-checks', default=False)
     opt.SAMBA3_ADD_OPTION('ldap')
     opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
-    opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('pam')
+    opt.SAMBA3_ADD_OPTION('pam_smbpass')
     opt.SAMBA3_ADD_OPTION('quotas')
     opt.SAMBA3_ADD_OPTION('sys-quotas')
     opt.SAMBA3_ADD_OPTION('sendfile-support')
@@ -58,17 +46,22 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('syslog')
     opt.SAMBA3_ADD_OPTION('automount')
     opt.SAMBA3_ADD_OPTION('aio-support')
+    opt.SAMBA3_ADD_OPTION('profiling-data', default=False)
+
+    opt.SAMBA3_ADD_OPTION('cluster-support')
+
+    opt.add_option('--with-ctdb-dir',
+                   help=("Directory under which ctdb is installed"),
+                   action="store", dest='ctdb_dir', default=None)
+    opt.add_option('--enable-old-ctdb',
+                  help=("enable building against (too) old version of ctdb (default=false)"),
+                  action="store_true", dest='enable_old_ctdb', default=False)
+
 
 
 def configure(conf):
     from samba_utils import TO_LIST
 
-    if not conf.env.toplevel_build:
-        version = samba_version.load_version(env=conf.env)
-        conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
-        conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
-        conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
-
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.developer = True
@@ -76,29 +69,6 @@ def configure(conf):
     if Options.options.with_swat:
         conf.env['build_swat'] = True
 
-    if not conf.env.toplevel_build:
-        conf.RECURSE('../lib/replace')
-        conf.RECURSE('build')
-        conf.RECURSE('../lib/tdb')
-        conf.RECURSE('../lib/talloc')
-        conf.RECURSE('../lib/tevent')
-        conf.RECURSE('../lib/popt')
-        conf.RECURSE('../lib/nss_wrapper')
-        conf.RECURSE('../lib/socket_wrapper')
-        conf.RECURSE('../lib/zlib')
-        conf.RECURSE('../libcli/smbreadline')
-        conf.RECURSE('../lib/util')
-
-        conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace''')
-        if not conf.env.USING_SYSTEM_TDB:
-            conf.ADD_EXTRA_INCLUDES('#lib/tdb/include')
-        if not conf.env.USING_SYSTEM_TEVENT:
-            conf.ADD_EXTRA_INCLUDES('#lib/tevent')
-        if not conf.env.USING_SYSTEM_TALLOC:
-            conf.ADD_EXTRA_INCLUDES('#lib/talloc')
-        if not conf.env.USING_SYSTEM_POPT:
-            conf.ADD_EXTRA_INCLUDES('#lib/popt')
-
     conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
@@ -112,19 +82,19 @@ def configure(conf):
     conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
     conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
     conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
-    conf.CHECK_FUNCS('fseek64 fseeko64 ftell64 ftello64 setluid')
+    conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
     conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
     conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')
     conf.CHECK_FUNCS('fdopendir fdopendir64')
     conf.CHECK_FUNCS('getpwent_r getdents64 setenv strcasecmp fcvt fcvtl')
-    conf.CHECK_FUNCS('syslog vsyslog timegm setlocale nl_langinfo')
+    conf.CHECK_FUNCS('syslog vsyslog timegm setlocale')
     conf.CHECK_FUNCS_IN('nanosleep', 'rt')
     conf.CHECK_FUNCS('lutimes futimes utimensat futimens')
     conf.CHECK_FUNCS('mlock munlock mlockall munlockall')
     conf.CHECK_FUNCS('memalign posix_memalign hstrerror')
     conf.CHECK_FUNCS('shmget')
     conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True)
-    conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain')
+    conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain bind_textdomain_codeset')
     #FIXME: for some reason this one still fails
     conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
     conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
@@ -147,8 +117,9 @@ long ret = splice(0,0,1,0,400,0);
     # Check for inotify support
     conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
     conf.CHECK_FUNCS('inotify_init')
-    if "HAVE_LINUX_INOTIFY_H" in conf.env and "HAVE_INOTIFY_INIT" in conf.env:
-        conf.DEFINE('HAVE_INOTIFY', 1)
+    if "HAVE_INOTIFY_INIT" in conf.env:
+        if "HAVE_LINUX_INOTIFY_H" in conf.env or "HAVE_SYS_INOTIFY_H" in conf.env:
+            conf.DEFINE('HAVE_INOTIFY', 1)
 
     # Check for kernel change notify support
     conf.CHECK_CODE('''
@@ -179,7 +150,7 @@ main() {
                     'HAVE_KERNEL_OPLOCKS_IRIX', headers='fcntl.h',
                     msg="Checking for IRIX kernel oplock types")
 
-    # Check for krenel share modes
+    # Check for kernel share modes
     conf.CHECK_CODE('''
 #include <sys/types.h>
 #include <fcntl.h>
@@ -264,18 +235,18 @@ extattr_get_link extattr_list_fd extattr_list_file extattr_list_link
 extattr_set_fd extattr_set_file extattr_set_link _facl __facl _fchdir
 __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
 fdelproplist fgetea fgetproplist fgetxattr flistea flistxattr fopen64
-_fork __fork fremoveea fremovexattr fseek64 fseeko64 fsetea
+_fork __fork fremoveea fremovexattr fseeko fseek64 fseeko64 fsetea
 fsetproplist fsetxattr _fstat __fstat fstat64 _fstat64 __fstat64 fsync
 ftell64 ftello64 ftruncate64 futimens futimes __fxstat getauthuid
 getcwd _getcwd __getcwd getdents __getdents getdents64 getdirentries
-getgrent getgrnam getgrouplist getmntent getpagesize
+getgrent getgrnam getgrouplist getgrset getmntent getpagesize
 getproplist get_proplist_entry getpwanam getpwent_r getrlimit gettext
 glob grantpt hstrerror initgroups innetgr
 inotify_init lgetea lgetxattr listea listxattr llistea llistxattr
 llseek _llseek __llseek lremoveea lremovexattr _lseek __lseek lseek64
 lsetea lsetxattr _lstat __lstat lstat64 _lstat64 __lstat64 lutimes
 __lxstat memalign mknod mknod64 mlock mlockall munlock munlockall
-nl_langinfo _open __open open64 _open64 __open64 _opendir __opendir
+_open __open open64 _open64 __open64 _opendir __opendir
 opendir64 pathconf poll posix_fallocate posix_fallocate64
 posix_memalign prctl pread _pread __pread pread64 _pread64 __pread64
 pwrite _pwrite __pwrite pwrite64 _pwrite64
@@ -285,7 +256,7 @@ seekdir64 select setea setenv setgidx setgroups setlocale setluid
 setmntent setpgid setpriv setproplist setsid setuidx
 setxattr shmget shm_open sigaction sigblock sigprocmask sigset
 sizeof_proplist_entry _stat __stat stat64 _stat64 __stat64 statvfs
-strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctlbyname
+strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
 __sys_llseek syslog _telldir __telldir telldir64 textdomain timegm
 utimensat vsyslog _write __write __xstat
 ''')
@@ -294,7 +265,6 @@ utimensat vsyslog _write __write __xstat
 
     # FIXME: these should be tests for features, but the old build system just
     # checks for OSes.
-    import sys
     host_os = sys.platform
     Logs.info("building on %s" % host_os)
 
@@ -315,13 +285,15 @@ utimensat vsyslog _write __write __xstat
         conf.ADD_CFLAGS('-fno-common')
     elif (host_os.rfind('freebsd') > -1):
         if conf.CHECK_HEADERS('sunacl.h'):
-            conf.define('HAVE_FREEBSD_SUNACL_H', '1')
+            conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
             conf.CHECK_FUNCS_IN('acl', 'sunacl')
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('netbsd') > -1):
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('openbsd') > -1):
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+    elif (host_os.rfind('sunos') > -1):
+        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     # FIXME: Add more checks here.
     else:
         Logs.warn("Unknown host_os '%s', please report this to samba-technical@samba.org" % host_os)
@@ -366,50 +338,30 @@ return acl_get_perm_np(permset_d, perm);
 
     if conf.CONFIG_SET('HAVE_FALLOCATE'):
         conf.CHECK_CODE('''
-               #if defined(HAVE_UNISTD_H)
-               #include <unistd.h>
-               #endif
-               #include <sys/types.h>
-               #define _GNU_SOURCE
-               #include <fcntl.h>
-               #if defined(HAVE_LINUX_FALLOC_H)
-               #include <linux/falloc.h>
-               #endif
                int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
                'HAVE_LINUX_FALLOCATE',
-               msg="Checking whether the Linux 'fallocate' function is available")
+               msg="Checking whether the Linux 'fallocate' function is available",
+               headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
     if conf.CONFIG_SET('HAVE_FALLOCATE64'):
         conf.CHECK_CODE('''
-               #if defined(HAVE_UNISTD_H)
-               #include <unistd.h>
-               #endif
-               #include <sys/types.h>
-               #define _GNU_SOURCE
-               #include <fcntl.h>
-               #if defined(HAVE_LINUX_FALLOC_H)
-               #include <linux/falloc.h>
-               #endif
                int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
                'HAVE_LINUX_FALLOCATE64',
-               msg="Checking whether the Linux 'fallocate64' function is available")
+               msg="Checking whether the Linux 'fallocate64' function is available",
+               headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
     conf.CHECK_CODE('''
-               #if defined(HAVE_UNISTD_H)
-               #include <unistd.h>
-               #endif
-               #include <fcntl.h>
                ssize_t err = readahead(0,0,0x80000);''',
                'HAVE_LINUX_READAHEAD',
-               msg="Checking whether Linux readahead is available")
+               msg="Checking whether Linux readahead is available",
+               headers='unistd.h fcntl.h')
     conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
 
     conf.CHECK_CODE('''
-               #include <sys/types.h>
-               #include <sys/socket.h>],
                struct ucred cred;
                socklen_t cred_len;
                int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);''',
                'HAVE_PEERCRED',
-               msg="Checking whether we can use SO_PEERCRED to get socket credentials")
+               msg="Checking whether we can use SO_PEERCRED to get socket credentials",
+               headers='sys/types.h sys/socket.h')
 
     conf.CHECK_CODE('''
                #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
@@ -510,18 +462,22 @@ msg.msg_acctrightslen = sizeof(fd);
                                 define='HAVE_DIRENT_D_OFF')
 
     conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent')
+    if conf.CHECK_CFLAGS('-Werror-implicit-function-declaration'):
+        netgrent_cflags = '-Werror-implicit-function-declaration'
+    else:
+        netgrent_cflags = ''
     conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE',
                     msg="Checking for setnetgrent prototype",
                     headers='netdb.h netgroup.h',
-                    cflags="-Werror-implicit-function-declaration")
+                    cflags=netgrent_cflags)
     conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE',
                     msg="Checking for getnetgrent prototype",
                     headers='netdb.h netgroup.h',
-                    cflags="-Werror-implicit-function-declaration")
+                    cflags=netgrent_cflags)
     conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE',
                     msg="Checking for endnetgrent prototype",
                     headers='netdb.h netgroup.h',
-                    cflags="-Werror-implicit-function-declaration")
+                    cflags=netgrent_cflags)
 
 
     # Look for CUPS
@@ -532,7 +488,7 @@ msg.msg_acctrightslen = sizeof(fd);
             # gssapi_krb5 and other libraries to its --libs output. That breaks the use
             # of an in-tree heimdal kerberos
            conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags",
-                           package="", uselib_store="cups")
+                           package="", uselib_store="CUPS")
         conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups')
         conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups')
         if conf.CONFIG_SET('HAVE_CUPS_CUPS_H') and conf.CONFIG_SET('HAVE_CUPS_LANGUAGE_H'):
@@ -556,22 +512,17 @@ msg.msg_acctrightslen = sizeof(fd);
 
     # Check for LDAP
     if Options.options.with_ldap:
-        conf.CHECK_HEADERS('ldap.h lber.h')
+        conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h')
         conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
         conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
         conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
-        # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
-        # SASL wrapping hooks
-        if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
-                conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
-            conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
 
         # if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
         # for the samba logs
         conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN',
                             define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h')
 
-        conf.CHECK_FUNCS_IN('ldap_init ldap_initialize ldap_set_rebind_proc', 'ldap')
+        conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', 'ldap')
         conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap')
 
         # Check if ldap_set_rebind_proc() takes three arguments
@@ -588,47 +539,53 @@ msg.msg_acctrightslen = sizeof(fd);
             conf.DEFINE('HAVE_LDAP', '1')
             conf.DEFINE('LDAP_DEPRECATED', '1')
             conf.env['HAVE_LDAP'] = '1'
+            # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
+            # SASL wrapping hooks
+            if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
+                    conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
+                conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
     else:
         conf.SET_TARGET_TYPE('ldap', 'EMPTY')
         conf.SET_TARGET_TYPE('lber', 'EMPTY')
 
     # Check for kerberos
     have_gssapi=False
-    if Options.options.with_krb5 and not conf.env.toplevel_build:
+    if Options.options.with_mit_krb5_checks and conf.env.developer:
         Logs.info("Looking for kerberos features")
         conf.find_program('krb5-config', var='KRB5_CONFIG')
         if conf.env.KRB5_CONFIG:
             conf.check_cfg(path="krb5-config", args="--cflags --libs",
-                       package="gssapi", uselib_store="krb5")
+                       package="gssapi", uselib_store="KRB5")
         conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
-        conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h', lib='krb5')
+        conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h', lib='krb5')
 
         if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
             conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
 
         conf.CHECK_FUNCS_IN('_et_list', 'com_err')
         conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
-        conf.CHECK_FUNCS_IN('crypto', 'des_set_key')
+       conf.CHECK_FUNCS_IN('des_set_key','crypto')
         conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
         conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
         if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
            conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi_krb5'):
             have_gssapi=True
-        conf.CHECK_FUNCS_IN('gss_wrap_iov', 'gssapi gssapi_krb5 krb5')
+        conf.CHECK_FUNCS_IN('''gss_wrap_iov gss_krb5_import_cred gss_get_name_attribute gss_mech_krb5 gss_oid_equal
+gss_inquire_sec_context_by_oid gsskrb5_extract_authz_data_from_sec_context''', 'gssapi gssapi_krb5 krb5')
         conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
         conf.CHECK_FUNCS('''
-krb5_set_real_time krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
+krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
 krb5_set_default_tgs_ktypes krb5_principal2salt krb5_use_enctype
 krb5_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey
 krb5_auth_con_setuseruserkey krb5_locate_kdc krb5_get_permitted_enctypes
 krb5_get_default_in_tkt_etypes krb5_free_data_contents
 krb5_principal_get_comp_string krb5_free_unparsed_name
 krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init
-krb5_krbhst_get_addrinfo krb5_c_enctype_compare krb5_enctypes_compatible_keys
+krb5_krbhst_get_addrinfo krb5_c_enctype_compare
 krb5_crypto_init krb5_crypto_destroy krb5_decode_ap_req free_AP_REQ
-krb5_verify_checksum krb5_c_verify_checksum krb5_principal_compare_any_realm
+krb5_c_verify_checksum krb5_principal_compare_any_realm
 krb5_parse_name_norealm krb5_princ_size krb5_get_init_creds_opt_set_pac_request
-krb5_get_renewed_creds krb5_get_kdc_cred krb5_free_error_contents
+krb5_get_renewed_creds krb5_free_error_contents
 initialize_krb5_error_table krb5_get_init_creds_opt_alloc
 krb5_get_init_creds_opt_free krb5_get_init_creds_opt_get_error
 krb5_enctype_to_string krb5_fwd_tgt_creds krb5_auth_con_set_req_cksumtype
@@ -642,6 +599,9 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
         conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h')
         conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h')
         conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
+       conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
+       conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
+       conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h')
         conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
                                     define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
         conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
@@ -738,14 +698,6 @@ int main(void) {
                         headers='krb5.h', lib='krb5',
                         addmain=False,
                         msg="Checking whether krb5_principal_get_realm is defined")
-        if conf.CHECK_CODE('''krb5_verify_checksum(0, 0, 0, 0, 0, 0, 0);''',
-                        'KRB5_VERIFY_CHECKSUM_ARGS',
-                        headers='krb5.h', lib='krb5',
-                       msg="Checking whether krb5_verify_checksum takes 7 arguments"):
-            conf.DEFINE('KRB5_VERIFY_CHECKSUM_ARGS', '7')
-       else:
-            conf.DEFINE('KRB5_VERIFY_CHECKSUM_ARGS', '6')
-
        conf.CHECK_CODE('''
 krb5_enctype enctype;
 enctype = ENCTYPE_ARCFOUR_HMAC_MD5;
@@ -787,88 +739,6 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
         'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
         link=False,
         msg="Checking for KRB5_DEPRECATED define taking an identifier")
-    elif conf.env.toplevel_build:
-        # setup the right defines for a in-tree heimdal build
-        Logs.info("Using in-tree heimdal kerberos defines")
-        conf.define('HAVE_GSSAPI', 1)
-        conf.define('HAVE_GSSAPI_GSSAPI_H', 1)
-        conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1)
-        conf.define('HAVE_KRB5_ADDRESSES', 1)
-        conf.define('HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', 1)
-        conf.define('HAVE_KRB5_SET_REAL_TIME', 1)
-        conf.define('HAVE_COM_ERR_H', 1)
-        conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)
-        conf.define('HAVE_GSS_DISPLAY_STATUS', 1)
-        conf.define('HAVE_LIBGSSAPI', 1)
-        conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)
-        conf.define('HAVE_CHECKSUM_IN_KRB5_CHECKSUM', 1)
-        conf.define('HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE', 0)
-        conf.define('HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER', 0)
-        conf.define('HAVE_E_DATA_POINTER_IN_KRB5_ERROR', 1)
-        conf.define('HAVE_INITIALIZE_KRB5_ERROR_TABLE', 1)
-        conf.define('HAVE_KRB5_ADDRESSES', 1)
-        conf.define('HAVE_KRB5_AUTH_CON_SETKEY', 1)
-        conf.define('HAVE_KRB5_CRYPTO', 1)
-        conf.define('HAVE_KRB5_CRYPTO_DESTROY', 1)
-        conf.define('HAVE_KRB5_CRYPTO_INIT', 1)
-        conf.define('HAVE_KRB5_C_ENCTYPE_COMPARE', 1)
-        conf.define('HAVE_KRB5_C_VERIFY_CHECKSUM', 1)
-        conf.define('HAVE_FREE_AP_REQ', 1)
-        conf.define('HAVE_KRB5_DECODE_AP_REQ', 1)
-        conf.define('HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS', 1)
-        conf.define('HAVE_KRB5_ENCTYPE_TO_STRING', 1)
-        conf.define('HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG', 1)
-        conf.define('HAVE_KRB5_FREE_ERROR_CONTENTS', 1)
-        conf.define('HAVE_KRB5_FREE_HOST_REALM', 1)
-        conf.define('HAVE_KRB5_FWD_TGT_CREDS', 1)
-        conf.define('HAVE_KRB5_GET_CREDS', 1)
-        conf.define('HAVE_KRB5_GET_CREDS_OPT_ALLOC', 1)
-        conf.define('HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE', 1)
-        conf.define('HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES', 1)
-        conf.define('HAVE_KRB5_GET_HOST_REALM', 1)
-        conf.define('HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC', 1)
-        conf.define('HAVE_KRB5_GET_INIT_CREDS_OPT_FREE', 1)
-        conf.define('HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR', 1)
-        conf.define('HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST', 1)
-        conf.define('HAVE_KRB5_GET_KDC_CRED', 1)
-        conf.define('HAVE_KRB5_GET_PW_SALT', 1)
-        conf.define('HAVE_KRB5_GET_RENEWED_CREDS', 1)
-        conf.define('HAVE_KRB5_KEYBLOCK_KEYVALUE', 1)
-        conf.define('HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', 1)
-        conf.define('HAVE_KRB5_KRBHST_GET_ADDRINFO', 1)
-        conf.define('HAVE_KRB5_KRBHST_INIT', 1)
-        conf.define('HAVE_KRB5_KT_COMPARE', 1)
-        conf.define('HAVE_KRB5_KT_FREE_ENTRY', 1)
-        conf.define('HAVE_KRB5_KU_OTHER_CKSUM', 1)
-        conf.define('HAVE_KRB5_LOCATE_PLUGIN_H', 1)
-        conf.define('HAVE_KRB5_MK_REQ_EXTENDED', 1)
-        conf.define('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM', 1)
-        conf.define('HAVE_KRB5_PRINCIPAL_GET_COMP_STRING', 1)
-        conf.define('HAVE_KRB5_PRINCIPAL_GET_REALM', 1)
-        conf.define('HAVE_KRB5_REALM_TYPE', 1)
-        conf.define('HAVE_KRB5_SESSION_IN_CREDS', 1)
-        conf.define('HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES', 1)
-        conf.define('HAVE_KRB5_SET_REAL_TIME', 1)
-        conf.define('HAVE_KRB5_STRING_TO_KEY', 1)
-        conf.define('HAVE_KRB5_STRING_TO_KEY_SALT', 1)
-        conf.define('HAVE_KRB5_VERIFY_CHECKSUM', 1)
-        conf.define('HAVE_LIBKRB5', 1)
-        conf.define('KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT', 1)
-        conf.define('KRB5_VERIFY_CHECKSUM_ARGS', 6)
-        conf.define('HAVE_ETYPE_IN_ENCRYPTEDDATA', 1)
-        conf.define('KRB5_PRINC_REALM_RETURNS_REALM', 1)
-        conf.define('HAVE_KRB5_PRINCIPAL_GET_REALM', 1)
-        conf.define('HAVE_KRB5_H', 1)
-        conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', 1)
-        conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1)
-        conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', 1)
-        conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC', 1)
-    else:
-        conf.SET_TARGET_TYPE('krb5', 'EMPTY')
-        conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
-        conf.SET_TARGET_TYPE('gssapi_krb5', 'EMPTY')
-        conf.SET_TARGET_TYPE('com_err', 'EMPTY')
-        conf.SET_TARGET_TYPE('k5crypto', 'EMPTY')
 
     if Options.options.with_ads:
         use_ads=True
@@ -879,6 +749,33 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
         if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'):
             Logs.warn("krb5_mk_req_extended not found in -lkrb5")
             use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_C_ENCTYPE_COMPARE'):
+            Logs.warn("krb5_c_enctype_compare not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_GET_HOST_REALM'):
+            Logs.warn("krb5_get_host_realm not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_FREE_HOST_REALM'):
+            Logs.warn("krb5_free_host_realm not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_FWD_TGT_CREDS'):
+            Logs.warn("krb5_fwd_tgt_creds found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC'):
+            Logs.warn("krb5_get_init_creds_opt_alloc not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT'):
+            Logs.warn("krb5_get_init_creds_opt_free was not found or was too old in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_GET_RENEWED_CREDS'):
+            Logs.warn("krb5_get_renewed_creds not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM'):
+            Logs.warn("krb5_principal_compare_any_realm not found in -lkrb5")
+            use_ads=False
+        if not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY'):
+            Logs.warn("krb5_string_to_key not found in -lkrb5")
+            use_ads=False
         if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \
            not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'):
             Logs.warn("no CREATE_KEY_FUNCTIONS detected")
@@ -891,9 +788,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
            not conf.CONFIG_SET('HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS'):
             Logs.warn("no KT_FREE_FUNCTION detected")
             use_ads=False
-        if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') and \
-           not conf.CONFIG_SET('HAVE_KRB5_VERIFY_CHECKSUM'):
-            Logs.warn("no KRB5_VERIFY_CHECKSUM_FUNCTION detected")
+        if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM'):
+            Logs.warn("krb5_c_verify_checksum_compare not found in -lkrb5")
             use_ads=False
         if not conf.CONFIG_SET('KRB5_TICKET_HAS_KEYINFO'):
             # We only need the following functions if we can't get the enctype
@@ -904,11 +800,24 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
             if not conf.CONFIG_SET('HAVE_KRB5_DECODE_AP_REQ'):
                 Logs.warn("no KRB5_AP_REQ_DECODING_FUNCTION detected")
                 use_ads=False
+
+        # We don't actually use
+        # gsskrb5_extract_authz_data_from_sec_context, but it is a
+        # clue that this Heimdal, which does the PAC processing we
+        # need on the standard gss_inquire_sec_context_by_oid
+        if not conf.CONFIG_SET('HAVE_GSS_GET_NAME_ATTRIBUTE') and \
+            not (conf.CONFIG_SET('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT') and \
+                     conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID')):
+            Logs.warn("need eiterh gss_get_name_attribute or gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid in -lgssapi for PAC support")
+            use_ads=False
+
         if use_ads:
             conf.DEFINE('WITH_ADS', '1')
             conf.DEFINE('HAVE_KRB5', '1')
             if have_gssapi:
                 conf.DEFINE('HAVE_GSSAPI', '1')
+            if conf.CONFIG_SET('HAVE_LDAP'):
+                conf.env['HAVE_ADS'] = '1'
         else:
             Logs.warn("krb5 libs don't have all features required for Active Directory support")
             conf.undefine('HAVE_KRB5_H')
@@ -1184,14 +1093,11 @@ exit(1);
                                define='HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC')
 
     conf.CHECK_CODE('''
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <fcntl.h>],
 ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
 ''',
                'HAVE_POSIX_FADVISE',
-               msg='Checking whether posix_fadvise is available')
+               msg='Checking whether posix_fadvise is available',
+               headers='unistd.h fcntl.h')
 
     for v in ['_SC_NGROUPS_MAX', '_SC_NPROC_ONLN', '_SC_NPROCESSORS_ONLN', '_SC_PAGESIZE' ]:
         conf.CHECK_CODE('''
@@ -1209,7 +1115,7 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
 syscall(SYS_initgroups, 16, NULL, NULL, 0);
                    ''',
                    'HAVE_DARWIN_INITGROUPS',
-                   msg='Checking hether to use the Darwin-specific initgroups system call')
+                   msg='Checking whether to use the Darwin-specific initgroups system call')
 
     conf.CHECK_CODE('''struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));''',
                    'HAVE_UTIMBUF',
@@ -1292,9 +1198,9 @@ main() {
                    msg='Checking for ftruncate extend',
                    addmain=False,
                    execute=True)
-
-    if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
-        conf.define('ENABLE_BUILD_FARM_HACKS', '1')
+    if os.getenv('RUN_FROM_BUILD_FARM'):
+        Logs.info("enabling buildfarm hacks")
+        conf.DEFINE('ENABLE_BUILD_FARM_HACKS', '1')
 
     if Options.options.with_sendfile_support:
         if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1):
@@ -1475,10 +1381,15 @@ main() {
                 conf.DEFINE('AIX_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
 
-    conf.CHECK_CODE('''enum TDB_ERROR err = TDB_ERR_NESTING''',
-                   'HAVE_TDB_ERR_NESTING',
-                   headers='tdb.h',
-                   msg='Checking whether we have TDB_ERR_NESTING')
+    # Check for getcwd allowing a NULL arg.
+    conf.CHECK_CODE('''
+#include <unistd.h>
+main() {
+       char *s = getcwd(NULL,0);
+        exit(s != NULL ?  0 : 1);
+}''', 'GETCWD_TAKES_NULL', addmain=False, execute=True,
+        msg="getcwd takes a NULL argument")
+
 
     # UnixWare 7.x has its getspnam in -lgen
     conf.CHECK_FUNCS_IN('getspnam', 'gen')
@@ -1493,12 +1404,280 @@ main() {
         # For sys/quota.h and linux/quota.h
         conf.CHECK_HEADERS('sys/quota.h')
 
+
+    #
+    # checking for clustering extensions (CTDB)
+    #
+    if not Options.options.with_cluster_support:
+        have_cluster_support = False
+
+    else:
+
+        if Options.options.ctdb_dir:
+            conf.ADD_EXTRA_INCLUDES(Options.options.ctdb_dir + '/include')
+
+        srcdir = os.path.realpath(conf.srcdir)
+        if 'EXTRA_INCLUDES' in conf.env:
+            includes = ' '.join(conf.env['EXTRA_INCLUDES']).replace('#', srcdir + '/')
+        else:
+            includes = ''
+
+        have_cluster_support = True
+        ctdb_broken = ""
+
+        conf.CHECK_CODE('''
+            #define NO_CONFIG_H
+            #include "replace.h"
+            #include "system/wait.h"
+            #include "system/network.h"
+            #define private #error __USED_RESERVED_WORD_private__
+            #include <talloc.h>
+            #include <tdb.h>
+            #include <ctdb.h>
+
+            int main(void)
+            {
+                return 0;
+            }
+            ''',
+            'HAVE_CTDB_H',
+            addmain=False,
+            includes=includes,
+            msg='Checking for header ctdb.h')
+
+        if not conf.CONFIG_SET('HAVE_CTDB_H'):
+            have_cluster_support = False
+            ctdb_broken = "ctdb.h is required for cluster support"
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #define private #error __USED_RESERVED_WORD_private__
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                    return 0;
+                }
+                ''',
+                'HAVE_CTDB_PRIVATE_H',
+                addmain=False,
+                includes=includes,
+                msg='Checking for header ctdb_private.h')
+
+            if not conf.CONFIG_SET('HAVE_CTDB_PRIVATE_H'):
+                have_cluster_support = False
+                ctdb_broken = "ctdb_private.h is required for cluster support"
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                   int i = (int)CTDB_CONTROL_TRANS3_COMMIT;
+                   return 0;
+                }
+                ''',
+                'HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL',
+                addmain=False,
+                includes=includes,
+                msg='Checking for transaction support (TRANS3_COMMIT control)')
+
+            if not conf.CONFIG_SET('HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL'):
+                have_cluster_support = False
+                ctdb_broken = "ctdb transaction support missing or too old"
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                    int i = (int)CTDB_CONTROL_SCHEDULE_FOR_DELETION;
+                    return 0;
+                }
+                ''',
+                'HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL',
+                addmain=False,
+                includes=includes,
+                msg='Checking for SCHEDULE_FOR_DELETION control')
+
+            if not conf.CONFIG_SET('HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL'):
+                if not Options.options.enable_old_ctdb:
+                    have_cluster_support = False
+                    ctdb_broken = "SCHEDULE_FOR_DELETION control missing"
+                else:
+                    Logs.warn("ignoring missing SCHEDULE_FOR_DELETION control (--enable-old-ctdb)")
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                    struct ctdb_control_tcp _x;
+                    return 0;
+                }
+                ''',
+                'HAVE_STRUCT_CTDB_CONTROL_TCP',
+                addmain=False,
+                includes=includes,
+                msg='Checking for ctdb ipv4 support')
+
+            if not conf.CONFIG_SET('HAVE_STRUCT_CTDB_CONTROL_TCP'):
+                have_cluster_support = False
+                ctdb_broken = "missing struct ctdb_control_tcp"
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                    struct ctdb_control_tcp_addr _x;
+                    return 0;
+                }
+                ''',
+                'HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR',
+                addmain=False,
+                includes=includes,
+                msg='Checking for ctdb ipv6 support')
+
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_private.h>
+
+                int main(void)
+                {
+                    int i = (int)CTDB_CONTROL_CHECK_SRVIDS;
+                    return 0;
+                }
+                ''',
+                'HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL',
+                addmain=False,
+                includes=includes,
+               msg='Checking for CHECK_SRVIDS control')
+
+            if not conf.CONFIG_SET('HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL'):
+                if not Options.options.enable_old_ctdb:
+                    have_cluster_support = False
+                    ctdb_broken = "CHECK_SRVIDS control missing"
+                else:
+                    Logs.warn("ignoring missing CHECK_SRVIDS control (--enable-old-ctdb)")
+
+    if have_cluster_support:
+        Logs.info("building with cluster support")
+        conf.DEFINE('CLUSTER_SUPPORT', 1);
+    else:
+        if not Options.options.with_cluster_support:
+            Logs.info("building without cluster support")
+        else:
+            Logs.warn("building without cluster support: " + ctdb_broken)
+        conf.undefine('CLUSTER_SUPPORT')
+
+
+
     conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }',
                    'HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR',
                    addmain=False,
                    link=False,
                    msg='Checking whether we can compile with __attribute__((destructor))')
 
+    conf.CHECK_CODE('void seekdir(DIR *d, long loc) { return; }',
+                   'SEEKDIR_RETURNS_VOID',
+                   headers='sys/types.h dirent.h',
+                   msg='Checking whether seekdir returns void')
+
+    if Options.options.with_profiling_data:
+        conf.DEFINE('WITH_PROFILE', 1);
+
+    PTHREAD_CFLAGS='error'
+    PTHREAD_LDFLAGS='error'
+
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):
+            PTHREAD_CFLAGS='-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS'
+            PTHREAD_LDFLAGS='-lpthread'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthreads'):
+            PTHREAD_CFLAGS='-D_THREAD_SAFE'
+            PTHREAD_LDFLAGS='-lpthreads'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'c_r'):
+            PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
+            PTHREAD_LDFLAGS='-pthread'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNC('pthread_attr_init'):
+            PTHREAD_CFLAGS='-D_REENTRANT'
+            PTHREAD_LDFLAGS='-lpthread'
+    # especially for HP-UX, where the CHECK_FUNC macro fails to test for
+    # pthread_attr_init. On pthread_mutex_lock it works there...
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_mutex_lock', 'pthread'):
+            PTHREAD_CFLAGS='-D_REENTRANT'
+            PTHREAD_LDFLAGS='-lpthread'
+
+    if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
+        conf.ADD_CFLAGS(PTHREAD_CFLAGS)
+        conf.ADD_LDFLAGS(PTHREAD_LDFLAGS)
+        conf.CHECK_HEADERS('pthread.h')
+        conf.DEFINE('HAVE_PTHREAD', '1')
+
+    if Options.options.with_pthreadpool:
+        if conf.CONFIG_SET('HAVE_PTHREAD'):
+            conf.DEFINE('WITH_PTHREADPOOL', '1')
+        else:
+            Logs.warn("pthreadpool support cannot be enabled when pthread support was not found")
+            conf.undefine('WITH_PTHREADPOOL')
+
+    if conf.CHECK_HEADERS('gpfs_gpl.h'):
+        conf.DEFINE('HAVE_GPFS', '1')
+
+    # Note that all charset 'modules' must actually be static, due to dependency loop issues 
+    # if we include the module loader in iconv
+
     default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
                                       auth_sam auth_unix auth_winbind auth_wbc auth_server
                                       auth_domain auth_builtin vfs_default
@@ -1507,16 +1686,20 @@ main() {
 
     default_shared_modules=TO_LIST('''vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk
                                       vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap
-                                      vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850
-                                      charset_CP437 auth_script vfs_readahead vfs_xattr_tdb
+                                      vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 
+                                      auth_script vfs_readahead vfs_xattr_tdb
                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
                                       vfs_crossrename vfs_linux_xfs_sgid
                                       vfs_time_audit idmap_autorid''')
 
     if Options.options.developer:
-        default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond'))
-        default_shared_modules.extend(TO_LIST('charset_weird perfcount_test'))
+        default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond charset_weird'))
+        default_shared_modules.extend(TO_LIST('perfcount_test'))
+        default_shared_modules.extend(TO_LIST('vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test'))
+        default_shared_modules.extend(TO_LIST('auth_skel pdb_test'))
+
+    default_static_modules.extend(TO_LIST('pdb_samba4 auth_samba4 vfs_dfs_samba4'))
 
     if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
         default_static_modules.extend(TO_LIST('vfs_posixacl'))
@@ -1533,11 +1716,17 @@ main() {
     if conf.CONFIG_SET('HAVE_AIO') and (conf.CONFIG_SET('HAVE_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_MSGHDR_MSG_ACCTRIGHTS')):
        default_shared_modules.extend(TO_LIST('vfs_aio_fork'))
 
+    if conf.CONFIG_SET('HAVE_AIO') and Options.options.with_pthreadpool:
+       default_shared_modules.extend(TO_LIST('vfs_aio_pthread'))
+
     if conf.CONFIG_SET('HAVE_LDAP'):
         default_static_modules.extend(TO_LIST('pdb_ldap idmap_ldap'))
 
     if conf.CONFIG_SET('DARWINOS'):
-       default_shared_modules.extend(TO_LIST('charset_macosxfs'))
+       default_static_modules.extend(TO_LIST('charset_macosxfs'))
+
+    if conf.CONFIG_SET('HAVE_GPFS'):
+       default_shared_modules.extend(TO_LIST('vfs_gpfs vfs_gpfs_hsm_notify'))
 
     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
@@ -1594,7 +1783,7 @@ main() {
             conf.DEFINE('static_init_%s' % p, '{}')
         if p in shared_list:
             for entry in shared_list[p]:
-                conf.DEFINE('%s_init' % entry, 'init_samba_module')
+                conf.DEFINE('%s_init' % entry, 'samba_init_module')
                 conf.env[shared_env].append('%s' % entry)
 
     conf.SAMBA_CONFIG_H('include/config.h')
@@ -1606,3 +1795,4 @@ def ctags(ctx):
     cmd = 'ctags $(find %s/.. -name "*.[ch]" | grep -v "*_proto\.h")' % source_root
     print("Running: %s" % cmd)
     os.system(cmd)
+