applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't define dbus services

Browse source 
2007-01-31  Christian Persch  <chpe@svn.gnome.org>

	* configure.in:
	* gnome-settings-daemon/Makefile.am: Don't define dbus services

svn path=/trunk/; revision=7221
This commit is contained in:
Christian Persch 2007-01-31 22:46:48 +00:00 • committed by Christian Persch
parent 7e4de1a53c
commit 12205181f7
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-31 Christian Persch <chpe@svn.gnome.org>
* configure.in:
* gnome-settings-daemon/Makefile.am: Don't define dbus services
directory in configure. Bug #395383.
2007-01-31 Christian Persch <chpe@svn.gnome.org> 2007-01-31 Christian Persch <chpe@svn.gnome.org>
* capplets/accessibility/at-properties/Makefile.am: * capplets/accessibility/at-properties/Makefile.am:

5
configure.in
View file

@ -378,11 +378,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR) AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
# dbus directory
DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
AC_SUBST(DBUS_SERVICES_DIR)
AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test x"$GDK_PIXBUF_CSOURCE" = xno; then if test x"$GDK_PIXBUF_CSOURCE" = xno; then

2
gnome-settings-daemon/Makefile.am
View file

@ -113,7 +113,7 @@ gnome-settings-client.h: gsd-infos.xml
dbus-binding-tool --prefix=settings_daemon --mode=glib-client $< > $@ dbus-binding-tool --prefix=settings_daemon --mode=glib-client $< > $@
# DBUS stuff # DBUS stuff
servicedir = $(DBUS_SERVICES_DIR) servicedir = $(datadir)/dbus-1/services
service_in_files = org.gnome.SettingsDaemon.service.in service_in_files = org.gnome.SettingsDaemon.service.in
service_DATA = $(service_in_files:.service.in=.service) service_DATA = $(service_in_files:.service.in=.service)