From: Romain Pokrzywka <romain@kdab.com>
Date: Fri, 5 Feb 2010 08:54:16 +0000 (+0100)
Subject: variable name fix (DBUS_DAEMON_NAME instead of DAEMON_NAME)
X-Git-Tag: dbus-1.3.1~120^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27a46ea9cbf8d32882550a78c13e87a2bb6d1442;p=thirdparty%2Fdbus.git

variable name fix (DBUS_DAEMON_NAME instead of DAEMON_NAME)
---

diff --git a/bus/main.c b/bus/main.c
index 45e08f0fa..50f47dc32 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -74,7 +74,7 @@ signal_handler (int sig)
 static void
 usage (void)
 {
-  fprintf (stderr, DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect]\n");
+  fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect]\n");
   exit (1);
 }
 
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 5f7834703..bc40ec29b 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -11,7 +11,7 @@
 #cmakedefine DBUS_BINDIR   "@DBUS_BINDIR@"
 #cmakedefine DBUS_SYSTEM_CONFIG_FILE  "@DBUS_SYSTEM_CONFIG_FILE@"
 #cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
-#cmakedefine DAEMON_NAME "@DAEMON_NAME@"
+#cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
 #cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS  "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
 #cmakedefine DBUS_MACHINE_UUID_FILE "@DBUS_MACHINE_UUID_FILE@"
 //#cmakedefine DBUS_SESSION_BUS_DEFAULT_ADDRESS "@DBUS_SESSION_BUS_DEFAULT_ADDRESS@"