[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  6ba69da8d37 ctdb/wscript: Remove long pending unsupported option
       via  121687e7bd7 source3/wscript: Remove long pending unsupported option
      from  03e9575e38d s3:smbd: Avoid compiler warning for unused label

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6ba69da8d37cdc1c851835048b2eea5d13e1810f
Author: Anoop C S <anoopcs at samba.org>
Date:   Tue Jul 2 10:57:28 2024 +0530

    ctdb/wscript: Remove long pending unsupported option
    
    It has been a while since --with-libcephfs option was dropped. Therefore
    stop advertising it through waf scripts.
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Jul  2 09:13:20 UTC 2024 on atb-devel-224

commit 121687e7bd7d0f268347c3e4a37ffd5f06914a4d
Author: Anoop C S <anoopcs at samba.org>
Date:   Tue Jul 2 10:56:45 2024 +0530

    source3/wscript: Remove long pending unsupported option
    
    It has been a while since --with-libcephfs option was dropped. Therefore
    stop advertising it through waf scripts.
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 ctdb/wscript    | 8 --------
 source3/wscript | 8 --------
 2 files changed, 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index a557d0a872e..6a16991f413 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -102,9 +102,6 @@ def options(opt):
                    help=("Use pcap for packet capture (default=no)"),
                    action="store_true", dest='ctdb_pcap', default=False)
 
-    opt.add_option('--with-libcephfs',
-                   help=("Directory under which libcephfs is installed"),
-                   action="store", dest='libcephfs_dir', default=None)
     opt.add_option('--enable-ceph-reclock',
                    help=("Enable Ceph CTDB recovery lock helper (default=no)"),
                    action="store_true", dest='ctdb_ceph_reclock', default=False)
@@ -282,11 +279,6 @@ def configure(conf):
         Logs.info('Building with etcd support')
     conf.env.etcd_reclock = have_etcd_reclock
 
-    if Options.options.libcephfs_dir:
-        Logs.error('''--with-libcephfs no longer supported, please use compiler
-                   flags instead, e.g. GCC LIBRARY_PATH and C_INCLUDE_PATH''')
-        sys.exit(1)
-
     if Options.options.ctdb_ceph_reclock:
         if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
 					conf.CHECK_LIB('rados', shlib=True)):
diff --git a/source3/wscript b/source3/wscript
index d8f04646b03..4415b373913 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -86,10 +86,6 @@ def options(opt):
     opt.samba_add_onoff_option('fake-kaserver',
                           help=("Include AFS fake-kaserver support"), default=False)
 
-    opt.add_option('--with-libcephfs',
-                   help=("Directory under which libcephfs is installed"),
-                   action="store", dest='libcephfs_dir', default=None)
-
     opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True)
     opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True)
 
@@ -1622,10 +1618,6 @@ int main(void) {
             conf.DEFINE('HAVE_LINUX_IOCTL', '1')
 
     conf.env['CFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64"
-    if Options.options.libcephfs_dir:
-        Logs.error('''--with-libcephfs no longer supported, please use compiler
-                   flags instead, e.g. GCC LIBRARY_PATH and C_INCLUDE_PATH''')
-        sys.exit(1)
 
     if (Options.options.with_cephfs and
         conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and


-- 
Samba Shared Repository