From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH] tools: generate systemd service files only
 when systemd is available
Date: Tue, 20 Jan 2015 11:58:43 +0000
Message-ID: <1421755123.10440.243.camel@citrix.com>
References: <1421754466-3980-1-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1421754466-3980-1-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On Tue, 2015-01-20 at 11:47 +0000, Wei Liu wrote:
> Though that's not in any way harmful but it is on the other hand not
> very useful.

It's not 100% clear in the docs that you can call this macro twice, but
it definitely doesn't say you can't so I'd assume it was OK:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

> 
> Please rerun autogen.sh after applying this patch.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  tools/configure.ac | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 113285d..850ba23 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -12,16 +12,6 @@ hotplug/Linux/init.d/sysconfig.xencommons
>  hotplug/Linux/init.d/xen-watchdog
>  hotplug/Linux/init.d/xencommons
>  hotplug/Linux/init.d/xendomains
> -hotplug/Linux/systemd/proc-xen.mount
> -hotplug/Linux/systemd/var-lib-xenstored.mount
> -hotplug/Linux/systemd/xen-init-dom0.service
> -hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> -hotplug/Linux/systemd/xen-watchdog.service
> -hotplug/Linux/systemd/xenconsoled.service
> -hotplug/Linux/systemd/xendomains.service
> -hotplug/Linux/systemd/xenstored.service
> -hotplug/Linux/systemd/xenstored.socket
> -hotplug/Linux/systemd/xenstored_ro.socket
>  hotplug/Linux/vif-setup
>  hotplug/Linux/xen-backend.rules
>  hotplug/Linux/xen-hotplug-common.sh
> @@ -386,5 +376,21 @@ AC_SUBST(LIBNL3_CFLAGS)
>  fi # ! $rump
>  
>  AX_AVAILABLE_SYSTEMD()
> +
> +AS_IF([test "x$systemd" = "xy"], [
> +    AC_CONFIG_FILES([
> +    hotplug/Linux/systemd/proc-xen.mount
> +    hotplug/Linux/systemd/var-lib-xenstored.mount
> +    hotplug/Linux/systemd/xen-init-dom0.service
> +    hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> +    hotplug/Linux/systemd/xen-watchdog.service
> +    hotplug/Linux/systemd/xenconsoled.service
> +    hotplug/Linux/systemd/xendomains.service
> +    hotplug/Linux/systemd/xenstored.service
> +    hotplug/Linux/systemd/xenstored.socket
> +    hotplug/Linux/systemd/xenstored_ro.socket
> +    ])
> +])
> +
>  AC_OUTPUT()
>