From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 21 Jul 2024 12:22:44 +0000 (+0200)
Subject: build: remove unused macros
X-Git-Tag: dbus-1.15.10~9^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e24ee1e2746fa8ab3ebd0db52743c4cd00bd869;p=thirdparty%2Fdbus.git

build: remove unused macros

These were/are used as autoconf/CMake variable names, but were never
used by C code, so there's no need to export them as macros.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
Fixes: dca6591f ("Keep cmake defines GLIB_VERSION_... in sync with autotools.")
Fixes: cd2e3826 ("Add Meson build system")
---

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 77fc19c39..1cf57286f 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -79,7 +79,6 @@
 # define DBUS_ENABLE_X11_AUTOLAUNCH 1
 #endif
 
-#cmakedefine DBUS_WITH_GLIB 1
 #cmakedefine GLIB_VERSION_MIN_REQUIRED @GLIB_VERSION_MIN_REQUIRED@
 #cmakedefine GLIB_VERSION_MAX_ALLOWED  @GLIB_VERSION_MAX_ALLOWED@
 
diff --git a/meson.build b/meson.build
index 19b41cd90..55fa41df2 100644
--- a/meson.build
+++ b/meson.build
@@ -388,7 +388,6 @@ else
     have_gio_unix = false
 endif
 use_glib = glib.found() and gio.found()
-config.set('DBUS_WITH_GLIB', use_glib)
 
 if message_bus
     expat = dependency('expat')
@@ -458,7 +457,6 @@ else
         error('kqueue support requested but not found')
     endif
 endif
-config.set('DBUS_BUS_ENABLE_KQUEUE', use_kqueue)
 
 if get_option('launchd').disabled()
     use_launchd = false