[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  4265815 s3-waf: add --with-automount option.
       via  1668b4b waf: add clock_gettime clock ID checks to libreplace wscript.
       via  782cf1e s3-waf: fix wrong check for vfs_aio_fork dependencies.
      from  991eaa7 s3-waf: fix the build after winreg and rpc services changes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 4265815208e432ecdcc7219e3920d5c6c58ce0e4
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 7 13:21:35 2011 +0100

    s3-waf: add --with-automount option.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Feb  7 14:11:03 CET 2011 on sn-devel-104
    (cherry picked from commit 4b7d0492bbc92ca8ebcfa0c58fa2b692dc5585d5)

commit 1668b4b2e010b6a039a3e373c3e5cdb01e3098ab
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 7 13:12:17 2011 +0100

    waf: add clock_gettime clock ID checks to libreplace wscript.
    
    Guenther
    (cherry picked from commit 6baa3ef648b430232077199dfd48c37b5683dace)

commit 782cf1e492c977fa6fe02f3d965e9f4ba5baed80
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 7 12:38:48 2011 +0100

    s3-waf: fix wrong check for vfs_aio_fork dependencies.
    
    Guenther
    (cherry picked from commit 13d8290d0d4f574cadd0c5daabe4e527ce78db30)

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

Summary of changes:
 lib/replace/wscript |   18 +++++++++++++++++-
 source3/wscript     |    5 ++++-
 2 files changed, 21 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 7e90206..ad291a5 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -202,7 +202,23 @@ def configure(conf):
         # some systems are missing the declaration
         conf.CHECK_DECLS('fdatasync')
 
-    conf.CHECK_FUNCS_IN('clock_gettime', 'rt', checklibc=True)
+    if conf.CHECK_FUNCS_IN('clock_gettime', 'rt', checklibc=True):
+        for c in ['CLOCK_MONOTONIC', 'CLOCK_PROCESS_CPUTIME_ID', 'CLOCK_REALTIME']:
+            conf.CHECK_CODE('''
+			    #if TIME_WITH_SYS_TIME
+			    # include <sys/time.h>
+			    # include <time.h>
+			    #else
+			    # if HAVE_SYS_TIME_H
+			    #  include <sys/time.h>
+			    # else
+			    #  include <time.h>
+			    # endif
+			    #endif
+			    clockid_t clk = %s''' % c,
+			    'HAVE_%s' % c,
+			    msg='Checking whether the clock_gettime clock ID %s is available' % c)
+
 
     # these headers need to be tested as a group on freebsd
     conf.CHECK_HEADERS(headers='sys/socket.h net/if.h', together=True)
diff --git a/source3/wscript b/source3/wscript
index 0dd71fb..ad6129f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -54,6 +54,7 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('acl-support')
     opt.SAMBA3_ADD_OPTION('dnsupdate')
     opt.SAMBA3_ADD_OPTION('syslog')
+    opt.SAMBA3_ADD_OPTION('automount')
     opt.SAMBA3_ADD_OPTION('aio-support')
 
 
@@ -496,7 +497,7 @@ msg.msg_acctrightslen = sizeof(fd);
     if conf.CONFIG_SET('HAVE_STATFS_F_FSID'):
 	default_shared_modules.extend(TO_LIST('vfs_fileid'))
 
-    if conf.CONFIG_SET('HAVE_AIO') and conf.CONFIG_SET('HAVE_MSGHDR_MSG_CONTROL') and conf.CONFIG_SET('HAVE_MSGHDR_MSG_ACCTRIGHTS'):
+    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'))
 
     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
@@ -622,6 +623,8 @@ msg.msg_acctrightslen = sizeof(fd);
             sys.exit(1)
     if Options.options.with_syslog:
         conf.DEFINE('WITH_SYSLOG', '1')
+    if Options.options.with_automount:
+        conf.DEFINE('WITH_AUTOMOUNT', '1')
 
     # Check for LDAP
     if Options.options.with_ldap:


-- 
Samba Shared Repository