diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-01-12 14:27:20 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-01-12 14:27:20 +0100 |
| commit | 71e8ec899aed517e21f359d6f06ab86244179479 (patch) | |
| tree | 882e98d0db1f4773cb24716f2fce119e02ee31b7 /tools/vtpm | |
| parent | b85612442b24664719ab992ebf744bb7c1086955 (diff) | |
| download | xen-71e8ec899aed517e21f359d6f06ab86244179479.tar.gz xen-71e8ec899aed517e21f359d6f06ab86244179479.tar.bz2 xen-71e8ec899aed517e21f359d6f06ab86244179479.zip | |
Adds a check to vtpm_manager and vtpm Makefiles to verify openssl and
gmp dev files are installed. If files are missing, Makefile exits with a
message indicating that these tools will not be built, rather than an
error, which prevents Xen from building.
Signed-off-by: Vinnie Scarlata <vincent.r.scarlata@intel.com>
Diffstat (limited to 'tools/vtpm')
| -rw-r--r-- | tools/vtpm/Makefile | 13 | ||||
| -rw-r--r-- | tools/vtpm/Rules.mk | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile index a1c8aa6438..8224a9d304 100644 --- a/tools/vtpm/Makefile +++ b/tools/vtpm/Makefile @@ -11,6 +11,8 @@ VTPM_DIR = vtpm # Emulator tarball name TPM_EMULATOR_TARFILE = tpm_emulator-0.2b.tar.gz +GMP_HEADER = /usr/include/gmp.h + all: build build: $(TPM_EMULATOR_DIR) $(VTPM_DIR) build_sub @@ -55,5 +57,12 @@ $(VTPM_DIR): $(TPM_EMULATOR_TARFILE) patch -p1 <../vtpm.patch build_sub: - $(MAKE) -C $(TPM_EMULATOR_DIR) - $(MAKE) -C $(VTPM_DIR) + if [ -e $(GMP_HEADER) ]; then \ + $(MAKE) -C $(VTPM_DIR); \ + if [ "$(BUILD_EMULATOR)" = "y" ]; then \ + $(MAKE) -C $(TPM_EMULATOR_DIR); \ + fi \ + else \ + echo "*** Unable to build VTPMs. libgmp could not be found."; \ + fi + diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk index e840df141f..93b84cdaa5 100644 --- a/tools/vtpm/Rules.mk +++ b/tools/vtpm/Rules.mk @@ -33,5 +33,7 @@ $(OBJS): $(SRCS) -include $(DEP_FILES) +BUILD_EMULATOR = n + # Make sure these are just rules .PHONY : all build install clean |