Commit 1cd84d82 authored by Romain Pokrzywka's avatar Romain Pokrzywka Committed by Ralf Habacker

remove DBUS_DAEMON_EXECUTABLE_NAME, we already have DBUS_DAEMON_NAME, and use...

remove DBUS_DAEMON_EXECUTABLE_NAME, we already have DBUS_DAEMON_NAME, and use the specified name for the executable when building with cmake
parent 196b310d
...@@ -3,7 +3,7 @@ configdir=$(sysconfdir)/dbus-1 ...@@ -3,7 +3,7 @@ configdir=$(sysconfdir)/dbus-1
INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION -DDBUS_COMPILATION
EFENCE= EFENCE=
......
...@@ -467,9 +467,7 @@ else (WIN32) ...@@ -467,9 +467,7 @@ else (WIN32)
set (DBUS_DATADIR ${EXPANDED_DATADIR}) set (DBUS_DATADIR ${EXPANDED_DATADIR})
endif (WIN32) endif (WIN32)
set (DAEMON_NAME dbus-daemon) set(DBUS_DAEMON_NAME dbus-daemon CACHE STRING "The name of the dbus daemon executable")
add_definitions( -DDBUS_DAEMON_EXECUTABLE_NAME=\\"dbus-daemon\\" )
########### create config.h ############### ########### create config.h ###############
...@@ -557,6 +555,7 @@ message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} " ...@@ -557,6 +555,7 @@ message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} "
#message(" Building XML docs: ${enable_xml_docs} ") #message(" Building XML docs: ${enable_xml_docs} ")
#message(" Gettext libs (empty OK): ${INTLLIBS} ") #message(" Gettext libs (empty OK): ${INTLLIBS} ")
message(" Using XML parser: ${XML_LIB} ") message(" Using XML parser: ${XML_LIB} ")
message(" Daemon executable name: ${DBUS_DAEMON_NAME}")
if (WIN32) if (WIN32)
message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ") message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ")
message(" Session bus address: ${DBUS_SESSION_BUS_DEFAULT_ADDRESS} ") message(" Session bus address: ${DBUS_SESSION_BUS_DEFAULT_ADDRESS} ")
......
...@@ -81,6 +81,7 @@ set(DBUS_LIBRARIES dbus-1 dbus-internal) ...@@ -81,6 +81,7 @@ set(DBUS_LIBRARIES dbus-1 dbus-internal)
add_executable(dbus-daemon ${BUS_SOURCES} ${BUS_DIR}/main.c) add_executable(dbus-daemon ${BUS_SOURCES} ${BUS_DIR}/main.c)
target_link_libraries(dbus-daemon ${DBUS_LIBRARIES} ${XML_LIBRARY}) target_link_libraries(dbus-daemon ${DBUS_LIBRARIES} ${XML_LIBRARY})
set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
install_targets(/bin dbus-daemon) install_targets(/bin dbus-daemon)
install_files(/etc FILES ${config_DATA}) install_files(/etc FILES ${config_DATA})
......
...@@ -25,6 +25,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d ...@@ -25,6 +25,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d
## must come before we use the $USE_MAINTAINER_MODE variable later ## must come before we use the $USE_MAINTAINER_MODE variable later
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_DEFINE_UNQUOTED(DBUS_DAEMON_NAME,"dbus-daemon",[Name of executable])
# libtool versioning - this applies to libdbus # libtool versioning - this applies to libdbus
# #
# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
......
...@@ -2944,11 +2944,7 @@ _dbus_get_autolaunch_address (DBusString *address, ...@@ -2944,11 +2944,7 @@ _dbus_get_autolaunch_address (DBusString *address,
LPSTR lpFile; LPSTR lpFile;
char dbus_exe_path[MAX_PATH]; char dbus_exe_path[MAX_PATH];
char dbus_args[MAX_PATH * 2]; char dbus_args[MAX_PATH * 2];
#ifdef _DEBUG const char * daemon_name = DBUS_DAEMON_NAME ".exe";
const char * daemon_name = "dbus-daemond.exe";
#else
const char * daemon_name = "dbus-daemon.exe";
#endif
mutex = _dbus_global_lock ( cDBusAutolaunchMutex ); mutex = _dbus_global_lock ( cDBusAutolaunchMutex );
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
*/ */
#include <config.h>
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -91,11 +92,8 @@ int main(int argc,char **argv) ...@@ -91,11 +92,8 @@ int main(int argc,char **argv)
#endif #endif
GetModuleFileName(NULL,dbusDaemonPath,sizeof(dbusDaemonPath)); GetModuleFileName(NULL,dbusDaemonPath,sizeof(dbusDaemonPath));
#ifdef _DEBUG daemon_name = DBUS_DAEMON_NAME ".exe";
daemon_name = "dbus-daemond.exe";
#else
daemon_name = "dbus-daemon.exe";
#endif
if ((p = _mbsrchr (dbusDaemonPath, '\\'))) if ((p = _mbsrchr (dbusDaemonPath, '\\')))
{ {
*(p+1)= '\0'; *(p+1)= '\0';
...@@ -134,7 +132,7 @@ int main(int argc,char **argv) ...@@ -134,7 +132,7 @@ int main(int argc,char **argv)
if (result == 0) if (result == 0)
{ {
if (verbose) if (verbose)
fprintf(stderr, "Could not start dbus-daemon error=%d",GetLastError()); fprintf(stderr, "Could not start " DBUS_DAEMON_NAME ". error=%d",GetLastError());
return 4; return 4;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment