[tomboy-list] Tomboy packagers: OK to change dbus service dir discovery in configure?

[Boyd Timothy]

When I rolled the latest stable release (0.6.3) I noticed a problem I
hadn't seen before (because I was running an older distro that didn't
have session_bus_services_dir defined in dbus-1.pc).  Now that I do
have a newer dbus installed that defines this variable, "make
distcheck" fails because it attempts to install
org.gnome.Tomboy.service to /usr/share/dbus-1/services and my normal
user doesn't have permission.

Do any of you, particularly distro packagers, care if I modify
configure.in so that it doesn't attempt to automatically attempt to
discover the path?  Instead, you can manually copy the service file in
your RPM spec file or specify --with-dbus-service-dir=DIR during
configure.

This also makes running "make install" as a normal user much easier.

-Boyd

==== BEGIN PATCH ====
Index: configure.in
===================================================================
--- configure.in	(revision 1116)
+++ configure.in	(working copy)
@@ -103,30 +103,13 @@
 	      ENABLE_DBUS="$enableval")
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")

-#
-# Use pkg-config to check for the DBus Service directory if specified by
-# --enable-dbus-service-dir-check.
-#
-AC_ARG_ENABLE(dbus-service-dir-check,
-	      [  --enable-dbus-service-dir-check[[=no/yes]]    query for
service directory [[default: yes]]],
-	      [case "$enableval" in
-	      	yes) ENABLE_DBUS_SERVICE_DIR_CHECK=yes ;;
-	      	no)  ENABLE_DBUS_SERVICE_DIR_CHECK=no ;;
-	      	*)   AC_MSG_ERROR(bad value ${enableval} for
--enable-dbus-service-dir-check) ;;
-	      esac],
-	      [ENABLE_DBUS_SERVICE_DIR_CHECK=yes])
-AM_CONDITIONAL(ENABLE_DBUS_SERVICE_DIR_CHECK, test
"$ENABLE_DBUS_SERVICE_DIR_CHECK" = "yes")
-
-if test "$ENABLE_DBUS_SERVICE_DIR_CHECK" = "yes" ; then
-DBUS_SERVICE_DIR_TEST=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-if test "x$DBUS_SERVICE_DIR_TEST" != "x" ; then
-	DBUS_SERVICE_DIR=$DBUS_SERVICE_DIR_TEST
+AC_ARG_WITH(dbus_service_dir, [  --with-dbus-service-dir=DIR
  Where to install Tomboy's DBus service file.])
+AM_CONDITIONAL(WITH_DBUS_SERVICE_DIR, test "x$with_dbus_service_dir" != "x")
+if test "x$with_dbus_service_dir" != "x"; then
+	DBUS_SERVICE_DIR=$with_dbus_service_dir
+else
+	DBUS_SERVICE_DIR=${datadir}/dbus-1/services
 fi
-fi
-# Set DBUS_SERVICE_DIR if it's not already set
-if test "x$DBUS_SERVICE_DIR" = "x" ; then
-	DBUS_SERVICE_DIR=$datadir/dbus-1/services
-fi
 AC_SUBST(DBUS_SERVICE_DIR)

 #
==== END PATCH ====