From: Anoop C S <anoopcs@samba.org>
Date: Thu, 8 May 2025 07:50:08 +0000 (+0530)
Subject: source3/wscript: Remove extra config WITH_PROMETHEUS_EXPORTER
X-Git-Tag: tevent-0.17.0~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdb9fa71db37b45c83a4ff576dc684cb6685e131;p=thirdparty%2Fsamba.git

source3/wscript: Remove extra config WITH_PROMETHEUS_EXPORTER

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Anoop C S <anoopcs@samba.org>
Autobuild-Date(master): Fri May  9 12:04:16 UTC 2025 on atb-devel-224
---

diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 35b22762c98..42833a964c0 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -202,7 +202,7 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
     if conf.env.build_winexe == True:
         bld.SAMBAMANPAGES(winexe_manpages)
 
-    if bld.CONFIG_SET('WITH_PROMETHEUS_EXPORTER'):
+    if bld.CONFIG_SET('HAVE_EVHTTP_NEW') and bld.CONFIG_SET('WITH_PROFILE'):
         bld.SAMBAMANPAGES(prometheus_manpages)
 
     if bld.CONFIG_SET('ENABLE_SELFTEST'):
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index bf7e699c912..ce176450a87 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -951,7 +951,7 @@ plantestsuite("samba3.blackbox.smbclient_old_dir", "fileserver_smb1",
                             "script/tests/test_old_dirlisting.sh"),
                timelimit, smbclient3])
 
-with_prometheus_exporter = ("WITH_PROMETHEUS_EXPORTER" in config_hash)
+with_prometheus_exporter = ("HAVE_EVHTTP_NEW" and "WITH_PROFILE" in config_hash)
 
 for env in ["fileserver:local"]:
     plantestsuite("samba3.blackbox.net_usershare", env, [os.path.join(samba3srcdir, "script/tests/test_net_usershare.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', smbclient3])
diff --git a/source3/wscript b/source3/wscript
index 493cef1db23..9d7fc013041 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -214,7 +214,6 @@ long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
         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')
-        conf.DEFINE('WITH_PROMETHEUS_EXPORTER', 1)
         if not conf.CONFIG_SET('HAVE_EVHTTP_NEW'):
             conf.fatal("libevent support not found. "
                        "Try installing libevent-dev or libevent-devel. "