mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/config: add XEN_RUN_STORED to config.h
Instead of adding the definition of XEN_RUN_STORED to CFLAGS in multiple Makefiles, let configure add it to tools/config.h instead. Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
This commit is contained in:
Juergen Gross authored and Julien Grall committed
1 parent
dc45c3e8de
commit
5cd6585177
7 files changed
+14
-3
No files matched your search
@@ -41,7 +41,6 @@ MAN8DIR := $(mandir)/man8
|
|||||||
XEN_RUN_DIR := @XEN_RUN_DIR@
|
XEN_RUN_DIR := @XEN_RUN_DIR@
|
||||||
XEN_LOG_DIR := @XEN_LOG_DIR@
|
XEN_LOG_DIR := @XEN_LOG_DIR@
|
||||||
XEN_LIB_DIR := @XEN_LIB_DIR@
|
XEN_LIB_DIR := @XEN_LIB_DIR@
|
||||||
XEN_RUN_STORED := @XEN_RUN_STORED@
|
|
||||||
|
|
||||||
CONFIG_DIR := @CONFIG_DIR@
|
CONFIG_DIR := @CONFIG_DIR@
|
||||||
INITD_DIR := @INITD_DIR@
|
INITD_DIR := @INITD_DIR@
|
||||||
|
|||||||
@@ -2079,6 +2079,11 @@ _ACEOF
|
|||||||
XEN_RUN_STORED=$rundir_path/xenstored
|
XEN_RUN_STORED=$rundir_path/xenstored
|
||||||
|
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define XEN_RUN_STORED "$XEN_RUN_STORED"
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
XEN_LIB_DIR=$localstatedir/lib/xen
|
XEN_LIB_DIR=$localstatedir/lib/xen
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -138,6 +138,7 @@ AC_DEFINE_UNQUOTED([XEN_LOG_DIR], ["$XEN_LOG_DIR"], [Xen's log dir])
|
|||||||
|
|
||||||
XEN_RUN_STORED=$rundir_path/xenstored
|
XEN_RUN_STORED=$rundir_path/xenstored
|
||||||
AC_SUBST(XEN_RUN_STORED)
|
AC_SUBST(XEN_RUN_STORED)
|
||||||
|
AC_DEFINE_UNQUOTED([XEN_RUN_STORED], ["$XEN_RUN_STORED"], [Xenstore's runstate path])
|
||||||
|
|
||||||
XEN_LIB_DIR=$localstatedir/lib/xen
|
XEN_LIB_DIR=$localstatedir/lib/xen
|
||||||
AC_SUBST(XEN_LIB_DIR)
|
AC_SUBST(XEN_LIB_DIR)
|
||||||
|
|||||||
@@ -156,6 +156,9 @@
|
|||||||
/* Xen's script dir */
|
/* Xen's script dir */
|
||||||
#undef XEN_SCRIPT_DIR
|
#undef XEN_SCRIPT_DIR
|
||||||
|
|
||||||
|
/* Xenstore's runstate path */
|
||||||
|
#undef XEN_RUN_STORED
|
||||||
|
|
||||||
/* Enable large inode numbers on Mac OS X 10.5. */
|
/* Enable large inode numbers on Mac OS X 10.5. */
|
||||||
#ifndef _DARWIN_USE_64_BIT_INODE
|
#ifndef _DARWIN_USE_64_BIT_INODE
|
||||||
# define _DARWIN_USE_64_BIT_INODE 1
|
# define _DARWIN_USE_64_BIT_INODE 1
|
||||||
|
|||||||
Vendored
+5
@@ -4067,6 +4067,11 @@ _ACEOF
|
|||||||
XEN_RUN_STORED=$rundir_path/xenstored
|
XEN_RUN_STORED=$rundir_path/xenstored
|
||||||
|
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define XEN_RUN_STORED "$XEN_RUN_STORED"
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
XEN_LIB_DIR=$localstatedir/lib/xen
|
XEN_LIB_DIR=$localstatedir/lib/xen
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ include ../libs.mk
|
|||||||
# Include configure output (config.h)
|
# Include configure output (config.h)
|
||||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||||
CFLAGS += $(CFLAGS_libxentoolcore)
|
CFLAGS += $(CFLAGS_libxentoolcore)
|
||||||
CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
|
|
||||||
|
|
||||||
xs.opic: CFLAGS += -DUSE_PTHREAD
|
xs.opic: CFLAGS += -DUSE_PTHREAD
|
||||||
ifeq ($(CONFIG_Linux),y)
|
ifeq ($(CONFIG_Linux),y)
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ CFLAGS += $(CFLAGS_libxenevtchn)
|
|||||||
CFLAGS += $(CFLAGS_libxenctrl)
|
CFLAGS += $(CFLAGS_libxenctrl)
|
||||||
CFLAGS += $(CFLAGS_libxenguest)
|
CFLAGS += $(CFLAGS_libxenguest)
|
||||||
CFLAGS += $(CFLAGS_libxentoolcore)
|
CFLAGS += $(CFLAGS_libxentoolcore)
|
||||||
CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
|
|
||||||
|
|
||||||
ifdef CONFIG_STUBDOM
|
ifdef CONFIG_STUBDOM
|
||||||
CFLAGS += -DNO_SOCKETS=1
|
CFLAGS += -DNO_SOCKETS=1
|
||||||
|
|||||||