[gvfs] build: Add --with-systemduserunitdir option

[Ondrej Holy <oholy src gnome org>]

commit 5dcf92a112a010e67b6fc58dbd0b39cec8e823d6
Author: Yaroslav Shmelev <yars068 yandex ru>
Date:   Fri Jan 22 08:27:24 2016 +0100

    build: Add --with-systemduserunitdir option
    
    This option allows maintainers to specify the directory that contain
    a systemd user units, or disable it. Default location for these units
    is /usr/lib/systemd/user. This patch will switch from hard-coded path
    to configurable one.
    
    The patch was modified by Ondrej Holy <oholy redhat com>.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760293

 configure.ac                |   19 +++++++++++++++++++
 daemon/Makefile.am          |    3 ++-
 metadata/Makefile.am        |    3 ++-
 monitor/afc/Makefile.am     |    3 ++-
 monitor/gdu/Makefile.am     |    3 ++-
 monitor/goa/Makefile.am     |    3 ++-
 monitor/gphoto2/Makefile.am |    3 ++-
 monitor/hal/Makefile.am     |    3 ++-
 monitor/mtp/Makefile.am     |    3 ++-
 monitor/udisks2/Makefile.am |    3 ++-
 10 files changed, 37 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1caad91..5552267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,24 @@ fi
 
 AM_CONDITIONAL(USE_UDISKS2, [test "$msg_udisks2" = "yes"])
 
+dnl ************************************
+dnl *** Check for systemd user units ***
+dnl ************************************
+
+msg_systemd_user_units=no
+
+AC_ARG_WITH([systemduserunitdir],
+            [AS_HELP_STRING([--with-systemduserunitdir=PATH], [Set directory for systemd user units, or 'no' 
to disable])],
+            [systemd_userdir="$withval"],
+            [systemd_userdir="${prefix}/lib/systemd/user"])
+AC_SUBST([systemd_userdir])
+
+if test "x$systemd_userdir" != "xno"; then
+  PKG_CHECK_MODULES([SYSTEMD], [systemd >= 206], [msg_systemd_user_units=yes], 1)
+fi
+
+AM_CONDITIONAL([USE_SYSTEMD_USER_UNITS], [test "$msg_systemd_user_units" = "yes"])
+
 dnl **********************************
 dnl *** Check for libsystemd-login ***
 dnl **********************************
@@ -949,6 +967,7 @@ echo "
        Build GDU volume monitor:     $msg_gdu
        Build udisks2 volume monitor: $msg_udisks2
        Build GOA volume monitor:     $msg_goa
+        Use systemd user units:       $msg_systemd_user_units
         Use libsystemd-login:         $msg_libsystemd_login
         Use GCR:                      $msg_gcr
        GNOME Keyring support:        $msg_keyring
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 79113c7..08ddec7 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -39,9 +39,10 @@ servicedir = $(DBUS_SERVICE_DIR)
 service_in_files = org.gtk.vfs.Daemon.service.in
 service_DATA = org.gtk.vfs.Daemon.service
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-daemon.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = gvfs-daemon.service
+endif
 
 %.mount: %.mount.in ../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index e15e40e..b38d01b 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -72,9 +72,10 @@ servicedir = $(DBUS_SERVICE_DIR)
 service_in_files = org.gtk.vfs.Metadata.service.in
 service_DATA = org.gtk.vfs.Metadata.service
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-metadata.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = gvfs-metadata.service
+endif
 
 EXTRA_DIST =                           \
        $(service_in_files)             \
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
index bde7a90..48c7978 100644
--- a/monitor/afc/Makefile.am
+++ b/monitor/afc/Makefile.am
@@ -35,9 +35,10 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.AfcVolumeMonitor.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-afc-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
index 0c5c4e8..175d739 100644
--- a/monitor/gdu/Makefile.am
+++ b/monitor/gdu/Makefile.am
@@ -43,9 +43,10 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.GduVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-gdu-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/goa/Makefile.am b/monitor/goa/Makefile.am
index c1c45d9..af7845e 100644
--- a/monitor/goa/Makefile.am
+++ b/monitor/goa/Makefile.am
@@ -35,9 +35,10 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.GoaVolumeMonitor.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-goa-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
index 723fbbc..0cd8e1b 100644
--- a/monitor/gphoto2/Makefile.am
+++ b/monitor/gphoto2/Makefile.am
@@ -77,9 +77,10 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.GPhoto2VolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-gphoto2-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
index 888268f..88b402f 100644
--- a/monitor/hal/Makefile.am
+++ b/monitor/hal/Makefile.am
@@ -56,9 +56,10 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.HalVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-hal-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/mtp/Makefile.am b/monitor/mtp/Makefile.am
index 98e64b3..2a7e9de 100644
--- a/monitor/mtp/Makefile.am
+++ b/monitor/mtp/Makefile.am
@@ -40,9 +40,10 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.MTPVolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-mtp-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
diff --git a/monitor/udisks2/Makefile.am b/monitor/udisks2/Makefile.am
index 5c0a801..052fac5 100644
--- a/monitor/udisks2/Makefile.am
+++ b/monitor/udisks2/Makefile.am
@@ -48,9 +48,10 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gtk.vfs.UDisks2VolumeMonitor.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
-systemd_userdir = ${prefix}/lib/systemd/user
 systemd_user_in_files = gvfs-udisks2-volume-monitor.service.in
+if USE_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@