From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 24 May 2022 20:12:18 +0000 (+0200)
Subject: build-sys: drop DBUS_CMAKE
X-Git-Tag: dbus-1.15.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d6b74b2574da32d2c83893b967a16308615358;p=thirdparty%2Fdbus.git

build-sys: drop DBUS_CMAKE

TEST_LISTEN is defined by the cmake/autotools (or meson) build systems.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index cf329b510..f0fb75e2d 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -2,9 +2,6 @@
 
 #ifndef _DBUS_CONFIG_H
 #define _DBUS_CONFIG_H
-/****************************/
-/* indicate that we are building with cmake */
-#define DBUS_CMAKE 1
 
 /* On Windows, we expect to be using msvcrt.dll-compatible printf
  * (%I64u instead of %llu) unless otherwise specified. This must be
diff --git a/test/test-privserver.c b/test/test-privserver.c
index 3c512d99a..eb47980eb 100644
--- a/test/test-privserver.c
+++ b/test/test-privserver.c
@@ -135,11 +135,7 @@ main (int argc, char *argv[])
   if (!dbus_connection_add_filter (session, filter_session_message, testdata, NULL))
     die ("couldn't add filter");
 
-#ifdef DBUS_CMAKE
   server = dbus_server_listen (TEST_LISTEN, &error);
-#else
-  server = dbus_server_listen ("unix:tmpdir=/tmp", &error);
-#endif
   if (!server)
     die ("%s", error.message);
   testdata->private_addr = dbus_server_get_address (server);