diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-10-10 17:32:42 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-14 10:30:17 +0100 |
| commit | 59286be58a165407a5d3c75e91ee68109e748838 (patch) | |
| tree | c1165e18ebf80915f465cdf1fd307f7d5d2975f5 | |
| parent | df8589760ec9a86276da241a5c94d341aa1ddfcb (diff) | |
Fix configure --with-systemd-modules-load=DIR
Currently --with-systemd=DIR1 --with-systemd-modules-load=DIR2 will set
both XEN_SYSTEMD_DIR and XEN_SYSTEMD_MODULES_LOAD to DIR1. The reason is
that both AC_ARG_WITH() use 'systemd' as the name for the internal
variable. As a result the value of the first option is also use as the
value for the second option. Fix this by using another variable name.
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>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ijc -- ran autogen.sh as requested]
| -rw-r--r-- | m4/systemd.m4 | 2 | ||||
| -rwxr-xr-x | tools/configure | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 629d202c2c..a832d5985b 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AX_SYSTEMD_OPTIONS], [ [SYSTEMD_DIR="$withval"],[SYSTEMD_DIR=""]) AC_SUBST(SYSTEMD_DIR) - AC_ARG_WITH(systemd, + AC_ARG_WITH(systemd-modules-load, 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=""]) diff --git a/tools/configure b/tools/configure index e44e754177..950b4d4a1d 100755 --- a/tools/configure +++ b/tools/configure @@ -802,6 +802,7 @@ with_extra_qemuu_configure_args with_xenstored enable_systemd with_systemd +with_systemd_modules_load ' ac_precious_vars='build_alias host_alias @@ -8651,9 +8652,9 @@ fi -# Check whether --with-systemd was given. -if test "${with_systemd+set}" = set; then : - withval=$with_systemd; SYSTEMD_MODULES_LOAD="$withval" +# Check whether --with-systemd-modules-load was given. +if test "${with_systemd_modules_load+set}" = set; then : + withval=$with_systemd_modules_load; SYSTEMD_MODULES_LOAD="$withval" else SYSTEMD_MODULES_LOAD="" fi |