[Xen-changelog] [xen-unstable] Check for libxml2 if security tools are to be built, and adapt the

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189154915 -3600
# Node ID 9cc5858c145d490fc7d8672524a3b375b3cc7a3c
# Parent  32f331858d751f29b5970dd208c91e9dedea1182
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@xxxxxxxxxx>
---
 tools/Makefile          |    2 +-
 tools/check/Makefile    |    4 ++--
 tools/check/check_xml2  |    2 +-
 tools/security/Makefile |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff -r 32f331858d75 -r 9cc5858c145d tools/Makefile
--- a/tools/Makefile    Thu Sep 06 18:26:45 2007 +0100
+++ b/tools/Makefile    Fri Sep 07 09:48:35 2007 +0100
@@ -10,7 +10,7 @@ SUBDIRS-y += xentrace
 SUBDIRS-y += xentrace
 SUBDIRS-$(CONFIG_XCUTILS) += xcutils
 SUBDIRS-$(CONFIG_X86) += firmware
-SUBDIRS-y += security
+SUBDIRS-$(ACM_SECURITY) += security
 SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-y += guest-headers
diff -r 32f331858d75 -r 9cc5858c145d tools/check/Makefile
--- a/tools/check/Makefile      Thu Sep 06 18:26:45 2007 +0100
+++ b/tools/check/Makefile      Fri Sep 07 09:48:35 2007 +0100
@@ -7,7 +7,7 @@ all: build
 # Check this machine is OK for building on.
 .PHONY: build
 build:
-       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
./chk build
+       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
ACM_SECURITY=$(ACM_SECURITY) ./chk build
 
 # Check this machine is OK for installing on.
 # DO NOT use this check from 'make install' in the parent
@@ -15,7 +15,7 @@ build:
 # copy rather than actually installing.
 .PHONY: install
 install:
-       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
./chk install
+       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
ACM_SECURITY=$(ACM_SECURITY) ./chk install
 
 .PHONY: clean
 clean:
diff -r 32f331858d75 -r 9cc5858c145d tools/check/check_xml2
--- a/tools/check/check_xml2    Thu Sep 06 18:26:45 2007 +0100
+++ b/tools/check/check_xml2    Fri Sep 07 09:48:35 2007 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
-if [ ! "$LIBXENAPI_BINDINGS" = "y" ]
+if [ ! "$LIBXENAPI_BINDINGS" = "y" -a ! "$ACM_SECURITY" = "y" ]
 then
     echo -n "unused, "
     exit 0
diff -r 32f331858d75 -r 9cc5858c145d tools/security/Makefile
--- a/tools/security/Makefile   Thu Sep 06 18:26:45 2007 +0100
+++ b/tools/security/Makefile   Fri Sep 07 09:48:35 2007 +0100
@@ -66,7 +66,7 @@ install: all $(ACM_CONFIG_FILE)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
        $(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
 ifndef XEN_PYTHON_NATIVE_INSTALL
-       python python/setup.py install --home="$(DESTDIR)/usr" 
--install-lib="$(DESTDIR)$(LIBPATH)/python"
+       python python/setup.py install 
--install-lib="$(DESTDIR)$(LIBPATH)/python"
 else
        python python/setup.py install --root="$(DESTDIR)"
 endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog