From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 10 Oct 2014 07:19:48 +0000 (+0200)
Subject: Adjust helptext in m4/systemd.m4
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4194
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4346115bee9b75d6a8d28c4d65642368b572cbf9;p=xen.git

Adjust helptext in m4/systemd.m4

Use AS_HELP_STRING for proper formating, mention both options take a
directory, mention the default value, quote the arguments in brackets.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ijc -- ran autogen.sh as requested]
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/m4/systemd.m4 b/m4/systemd.m4
index 760bbada34..629d202c2c 100644
--- a/m4/systemd.m4
+++ b/m4/systemd.m4
@@ -18,12 +18,16 @@
 
 dnl Some optional path options
 AC_DEFUN([AX_SYSTEMD_OPTIONS], [
-	AC_ARG_WITH(systemd, [  --with-systemd          set directory for systemd service files],
-		SYSTEMD_DIR="$withval", SYSTEMD_DIR="")
+	AC_ARG_WITH(systemd,
+		AS_HELP_STRING([--with-systemd=DIR],
+		[set directory for systemd service files [PREFIX/lib/systemd/system]]),
+		[SYSTEMD_DIR="$withval"],[SYSTEMD_DIR=""])
 	AC_SUBST(SYSTEMD_DIR)
 
-	AC_ARG_WITH(systemd, [  --with-systemd-modules-load          set directory for systemd modules load files],
-		SYSTEMD_MODULES_LOAD="$withval", SYSTEMD_MODULES_LOAD="")
+	AC_ARG_WITH(systemd,
+		AS_HELP_STRING([--with-systemd-modules-load=DIR],
+		[set directory for systemd modules load files [PREFIX/lib/modules-load.d/]]),
+		[SYSTEMD_MODULES_LOAD="$withval"], [SYSTEMD_MODULES_LOAD=""])
 	AC_SUBST(SYSTEMD_MODULES_LOAD)
 ])
 
diff --git a/tools/configure b/tools/configure
index 2c76cb1ab8..491864f1a0 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1509,8 +1509,11 @@ Optional Packages:
                           dependencies resolved we'll enable the C xenstored
                           for you. If you ask for oxenstored we'll complain
                           until you resolve those dependencies
-  --with-systemd          set directory for systemd service files
-  --with-systemd-modules-load          set directory for systemd modules load files
+  --with-systemd=DIR      set directory for systemd service files
+                          [PREFIX/lib/systemd/system]
+  --with-systemd-modules-load=DIR
+                          set directory for systemd modules load files
+                          [PREFIX/lib/modules-load.d/]
 
 Some influential environment variables:
   CC          C compiler command