mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Luis R. Rodriguez
dff4c31163
As it stands oxenstored will be used by default if ocaml tools are found, the init system will also try to use oxenstored first if its found otherwise the cxenstored will be used. Lets simplify the init script and let users be explicit about the preference through configure. This adds support to let you be explicit about the xenstored preference, you can only use one of these two options: ./configure --with-xenstored=xenstored ./configure --with-xenstored=oxenstored We continue with the old behaviour and default oxenstored will be used but only if you have ocaml dependencies. Since the xenstored preference is explicit now and since we require configure substitutions for it we make use of the AX_XEN_EXPAND_CONFIG() helpers as otherwise substitution for SBINDIR is not propagated from the top level configuration. All this allows us to simplify the init script to use the configured xenstore from the start. We update the sysconfig/default xencommons file with the paths for the different options though, this can be used by users to override the default xenstored, this follows the old behaviour but we now just explicitly provide the full configured paths for users. As before, changing the xenstore requires a reboot. In order to help with documentation we update the README with some details on configure usage refer to the wiki [0] [1] [2] for more elaborate details. Since we are now parsing an entry within Paths.mk.in on tools we let the move the parsing of the file to be the tool's configure. [0] http://wiki.xen.org/wiki/Xenstored [1] http://wiki.xen.org/wiki/XenStore [2] http://wiki.xen.org/wiki/XenStoreReference Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Keir Fraser <keir@xen.org> Cc: Tim Deegan <tim@xen.org> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- ran autogen.sh ]
About
=====
This documents the upstream sources for the different slew of different
m4 sources we have picked up or developed.
pkg.m4
======
The pkg-config m4 macro library comes from the upstream pkg-config
git repository [0]. If you update the m4 library update this file
with provenance and last commit ID information. For documentation
on how to use this read the pkg-config(1) man page.
Do not modify this file yourself, if you want to evolve it send
patches upstream and then synch back here.
Tree: git://anongit.freedesktop.org/pkg-config
The last synch was from commit:
commit 4f0084d9d3b8726a797a373c7ec5e406000995d0
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Feb 3 15:59:18 2014 -0800
glib: Fix Makefiles to suppress warnings from automake
With the newly added glib.mk, some of the noinst_* variables need to use
+= in the evaluation to avoid multiple definition warnings from
automake.