build: use '--with-prometheus-exporter' configure option

Prefer '--with-prometheus-exporter' configure option over
'--with-libevent', which in turn, requires libevent.

Signed-off-by: Shachar Sharon <ssharon@redhat.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/script/autobuild.py b/script/autobuild.py
index ca227fc088bebee6312fbaa53e7e9bc58d654ef4..0283ec6754bbde40e62a152aa2b43f4c6dba790f 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -176,7 +176,7 @@ builddirs = {
 }
 
 ctdb_configure_params = " --enable-developer ${PREFIX}"
-samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --with-libevent"
+samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --with-prometheus-exporter"
 
 # We cannot configure himmelblau on old systems missing openssl 3, with glibc
 # older than version 2.32, or when cargo isn't available.
@@ -879,7 +879,7 @@ tasks = {
          "./configure.developer ${PREFIX} "
          "--with-selftest-prefix=./bin/ab "
          "--with-cluster-support "
-         "--with-libevent "
+         "--with-prometheus-exporter "
          "--bundled-libraries=!tdb"),
             ("samba-make", "make"),
             ("samba-check", "./bin/smbd --configfile=/dev/null -b | grep CLUSTER_SUPPORT"),
@@ -1040,7 +1040,7 @@ tasks = {
         "sequence": [
         # build the fuzzers (static) via the oss-fuzz script
             ("fuzzers-mkdir-prefix", "mkdir -p ${PREFIX_DIR}"),
-            ("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE= SANITIZER=address CXX= CFLAGS= ADDITIONAL_LDFLAGS='-fuse-ld=bfd' ./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl-fuzzer  --with-libevent"),
+            ("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE= SANITIZER=address CXX= CFLAGS= ADDITIONAL_LDFLAGS='-fuse-ld=bfd' ./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl-fuzzer --with-prometheus-exporter"),
         ],
     },
 
@@ -1119,7 +1119,7 @@ tasks = {
         "sequence": [
             ("random-sleep", random_sleep(300, 900)),
 
-            ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc  --with-libevent"),
+            ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc --with-prometheus-exporter"),
             ("make", "make -j"),
             ("find-python", "script/find_python.sh ${PREFIX}"),
             ("test", "make test-nopython"),

diff --git a/source3/wscript b/source3/wscript
index 6d9fbd6491c1095eff7258216c05d8eef37fe63a..c0a9c65f724c44966ce6e885191e1d377da74831 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -77,7 +77,7 @@ def options(opt):
     opt.samba_add_onoff_option('fam', default=None) # None means autodetection
     opt.samba_add_onoff_option('profiling-data', default=False)
     opt.samba_add_onoff_option('libarchive', default=True)
-    opt.samba_add_onoff_option('libevent', default=False)
+    opt.samba_add_onoff_option('prometheus-exporter', default=False)
 
     opt.samba_add_onoff_option('cluster-support', default=False)
 
@@ -207,7 +207,7 @@ long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
 
     # check for libevent, needed for prometheus http endpoint
     conf.SET_TARGET_TYPE('event', 'EMPTY')
-    if Options.options.with_libevent is True:
+    if Options.options.with_prometheus_exporter is True:
         Logs.info("Checking for libevent existence")
         if conf.CHECK_HEADERS('event2/http.h') and conf.CHECK_LIB('event', shlib=True):
             conf.CHECK_FUNCS_IN('evhttp_new', 'event')