gnome-settings-daemon r315 - in trunk: . data po

[lucasr svn gnome org]

Author: lucasr
Date: Mon Apr 21 18:58:18 2008
New Revision: 315
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=315&view=rev

Log:
2008-04-21  Lucas Rocha  <lucasr gnome org>

	Install .desktop for gnome-settings-daemon in a standard autostart
	directory as required by new gnome-session (bug #526984).

	* configure.ac: expand $libexecdir to be used on .desktop file. 
	* acinclude.m4: added new m4 macro (AS_AC_EXPAND) for expanding 
	variables.
	* data/Makefile.am, data/gnome-settings-daemon.desktop.in.in: install 
	g-s-d .desktop file.


Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Mon Apr 21 18:58:18 2008
@@ -84,3 +84,53 @@
     WARN_CFLAGS="$warning_flags $complCFLAGS"
     AC_SUBST(WARN_CFLAGS)
 ])
+
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Apr 21 18:58:18 2008
@@ -33,6 +33,8 @@
 
 AM_GLIB_GNU_GETTEXT
 
+AS_AC_EXPAND(LIBEXECDIR, "$libexecdir")
+
 GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
 
@@ -420,6 +422,7 @@
 plugins/xrdb/data/Makefile
 plugins/xsettings/Makefile
 data/Makefile
+data/gnome-settings-daemon.desktop.in
 data/gnome-settings-daemon.pc
 data/gnome-settings-daemon-uninstalled.pc
 po/Makefile.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Apr 21 18:58:18 2008
@@ -12,6 +12,11 @@
 
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(sysconfdir)/xdg/autostart
+desktop_in_files = gnome-settings-daemon.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.SettingsDaemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
@@ -25,12 +30,14 @@
 EXTRA_DIST = 				\
 	$(schemas_in_files)		\
 	$(service_in_files)		\
+	$(desktop_in_files)		\
 	gnome-settings-daemon.pc.in	\
 	$(NULL)
 
 DISTCLEANFILES = 			\
 	$(schemas_DATA)			\
 	$(service_DATA)			\
+	$(desktop_DATA)			\
 	$(NULL)
 
 MAINTAINERCLEANFILES =			\

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Apr 21 18:58:18 2008
@@ -3,6 +3,7 @@
 data/apps_gnome_settings_daemon_keybindings.schemas.in
 data/apps_gnome_settings_daemon_screensaver.schemas.in
 data/desktop_gnome_font_rendering.schemas.in
+data/gnome-settings-daemon.desktop.in
 data/gnome-settings-daemon.schemas.in
 gnome-settings-daemon/main.c
 [type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in