Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: Lan Yixun (dlan) <dennis.yxun <at> gmail.com>
Subject: [PATCH 2/2] introduce new '--with-systemdsystemunitdir'
Newsgroups: gmane.linux.kernel.autofs
Date: Monday 19th August 2013 06:23:18 UTC (over 4 years ago)
From: "Lan Yixun (dlan)" 

this option only control the path where the systemd unit file wll be
installed
and it's seperated from --with-systemd option, so it can be always
installed alone.

use cases:
1) if this option is not specificed, default option is
'--with-systemdsystemunitdir=yes'
will auto probe the directory of unit file
2) --with-systemdsystemunitdir=no, or --without-systemdsystemunitdir
no unit file will be installed
3) --with-systemdsystemunitdir=/my/unit/file/directory/
will install unit file into /my/unit/file/directory/
(gentoo linux goes the 3nd way)

this patch doesn't alter previous behavior, so should be compatible with
previous
version.

Signed-off-by: Lan Yixun (dlan) 
---
 Makefile.conf.in |  4 ++--
 aclocal.m4       | 43 +++++++++++++++++++++++++++++++++++++++++++
 configure.in     |  9 +++++++--
 samples/Makefile |  6 +++---
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/Makefile.conf.in b/Makefile.conf.in
index 3766d45..75f6dec 100644
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -107,5 +107,5 @@ mandir = @[email protected]
 # Location for init.d files
 initdir = @[email protected]
 
-# Location of systemd unit files
-systemddir = @[email protected]
+# Location of systemd unit dir
+systemdsystemunitdir = @[email protected]
diff --git a/aclocal.m4 b/aclocal.m4
index 5cdc7e4..cee7125 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -246,6 +246,49 @@ fi],
 ])
 
 dnl
--------------------------------------------------------------------------
+dnl AF_WITH_SYSTEMD_UNITS_DIR
+dnl
+dnl Check the location of the systemd unit files directory
+dnl
--------------------------------------------------------------------------
+AC_DEFUN([SYSTEMD_SYSTEM_UNITS],
+[AC_ARG_WITH(systemdsystemunitdir,
+[  --with-systemdsystemunitdir         install systemd unit file if
systemd unit directory
+			  is found on system],
+[
+AC_MSG_CHECKING([location of the systemd unit files directory])
+if test "$withval" = yes -o x"$withval" = x""; then
+    for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system
/lib/systemd/system /lib64/systemd/system; do
+      if test -z "$systemdsystemunitdir"; then
+        if test -d "$systemd_d"; then
+          systemdsystemunitdir="$systemd_d"
+          AC_MSG_RESULT($systemdsystemunitdir)
+        fi
+      fi
+    done
+else
+  if test "$withval" = no; then
+    AC_MSG_RESULT(not found)
+  else
+    systemdsystemunitdir=$withval
+    AC_MSG_RESULT($systemdsystemunitdir)
+  fi
+fi
+],
+[
+AC_MSG_CHECKING([location of the systemd unit files directory, default
yes])
+    for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system
/lib/systemd/system /lib64/systemd/system; do
+      if test -z "$systemdsystemunitdir"; then
+        if test -d "$systemd_d"; then
+          systemdsystemunitdir="$systemd_d"
+          AC_MSG_RESULT($systemdsystemunitdir)
+        fi
+      fi
+    done
+]
+)
+])
+
+dnl
--------------------------------------------------------------------------
 dnl AF_CHECK_LIBXML
 dnl
 dnl Check for lib xml
diff --git a/configure.in b/configure.in
index 559045a..3cc43ab 100644
--- a/configure.in
+++ b/configure.in
@@ -47,11 +47,16 @@ AF_PID_D()
 AC_SUBST(piddir)
 
 #
+# Check for systemd support is requested
+#
+AF_WITH_SYSTEMD()
+
+#
 # Check for systemd unit files direectory exists if unit file installation
 # is requested
 #
-AF_WITH_SYSTEMD()
-AC_SUBST(systemddir)
+SYSTEMD_SYSTEM_UNITS
+AC_SUBST(systemdsystemunitdir)
 
 #
 # Location of system config script directory?
diff --git a/samples/Makefile b/samples/Makefile
index 91c1d6b..4cf8bf3 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -32,9 +32,9 @@ dirs:
 .PHONY: autofs.init
 autofs.init:
 	@echo
-ifneq ($(systemddir),)
-	install -d -m 755 $(INSTALLROOT)$(systemddir)
-	install autofs.service -m 644 $(INSTALLROOT)$(systemddir)/autofs.service
+ifneq ($(systemdsystemunitdir),)
+	install -d -m 755 $(INSTALLROOT)$(systemdsystemunitdir)
+	install autofs.service -m 644
$(INSTALLROOT)$(systemdsystemunitdir)/autofs.service
 else
    ifneq ($(initdir),)
 	install -d -m 755 $(INSTALLROOT)$(initdir)
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe autofs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
CD: 4ms