ia64/xen-unstable

changeset 15848:9cc5858c145d

Check for libxml2 if security tools are to be built, and adapt the
python setup.py command line parameters to also work under SuSE.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author kfraser@localhost.localdomain
date Fri Sep 07 09:48:35 2007 +0100 (2007-09-07)
parents 32f331858d75
children f779ee15c553
files tools/Makefile tools/check/Makefile tools/check/check_xml2 tools/security/Makefile
line diff
     1.1 --- a/tools/Makefile	Thu Sep 06 18:26:45 2007 +0100
     1.2 +++ b/tools/Makefile	Fri Sep 07 09:48:35 2007 +0100
     1.3 @@ -10,7 +10,7 @@ SUBDIRS-y += examples
     1.4  SUBDIRS-y += xentrace
     1.5  SUBDIRS-$(CONFIG_XCUTILS) += xcutils
     1.6  SUBDIRS-$(CONFIG_X86) += firmware
     1.7 -SUBDIRS-y += security
     1.8 +SUBDIRS-$(ACM_SECURITY) += security
     1.9  SUBDIRS-y += console
    1.10  SUBDIRS-y += xenmon
    1.11  SUBDIRS-y += guest-headers
     2.1 --- a/tools/check/Makefile	Thu Sep 06 18:26:45 2007 +0100
     2.2 +++ b/tools/check/Makefile	Fri Sep 07 09:48:35 2007 +0100
     2.3 @@ -7,7 +7,7 @@ all: build
     2.4  # Check this machine is OK for building on.
     2.5  .PHONY: build
     2.6  build:
     2.7 -	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build
     2.8 +	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk build
     2.9  
    2.10  # Check this machine is OK for installing on.
    2.11  # DO NOT use this check from 'make install' in the parent
    2.12 @@ -15,7 +15,7 @@ build:
    2.13  # copy rather than actually installing.
    2.14  .PHONY: install
    2.15  install:
    2.16 -	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install
    2.17 +	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk install
    2.18  
    2.19  .PHONY: clean
    2.20  clean:
     3.1 --- a/tools/check/check_xml2	Thu Sep 06 18:26:45 2007 +0100
     3.2 +++ b/tools/check/check_xml2	Fri Sep 07 09:48:35 2007 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  #!/bin/sh
     3.5  # CHECK-BUILD CHECK-INSTALL
     3.6  
     3.7 -if [ ! "$LIBXENAPI_BINDINGS" = "y" ]
     3.8 +if [ ! "$LIBXENAPI_BINDINGS" = "y" -a ! "$ACM_SECURITY" = "y" ]
     3.9  then
    3.10      echo -n "unused, "
    3.11      exit 0
     4.1 --- a/tools/security/Makefile	Thu Sep 06 18:26:45 2007 +0100
     4.2 +++ b/tools/security/Makefile	Fri Sep 07 09:48:35 2007 +0100
     4.3 @@ -66,7 +66,7 @@ install: all $(ACM_CONFIG_FILE)
     4.4  	$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
     4.5  	$(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
     4.6  ifndef XEN_PYTHON_NATIVE_INSTALL
     4.7 -	python python/setup.py install --home="$(DESTDIR)/usr" --install-lib="$(DESTDIR)$(LIBPATH)/python"
     4.8 +	python python/setup.py install --install-lib="$(DESTDIR)$(LIBPATH)/python"
     4.9  else
    4.10  	python python/setup.py install --root="$(DESTDIR)"
    4.11  endif