Commit ec5de064 authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint moving parts of tmcd to lib/tmcd to create a common

library.
parent af7a50b4
......@@ -7,3 +7,4 @@
#undef ELVIN_COMPAT
#undef EMULAB_CLIENTSIDE
#undef LOG_TESTBED
#undef TPM
......@@ -4853,6 +4853,7 @@ outfiles="Makeconf GNUmakefile \
if test $WITH_EMULAB -eq 0; then
outfiles="$outfiles lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile"
else
ac_config_commands="$ac_config_commands lib"
......
......@@ -131,6 +131,16 @@ if test $ELVIN_COMPAT -eq 1; then
AC_DEFINE_UNQUOTED(ELVIN_COMPAT, 1)
fi
AC_ARG_ENABLE(TPM,
[ --enable-TPM[[=yes/no]] Include TPM support [[default=no]]])
if test "$enable_TPM" = "yes"; then
TPM=1
fi
if test $TPM -eq 1; then
AC_DEFINE_UNQUOTED(TPM, 1)
fi
# BEGIN Python detection. For the event library.
AC_PATH_PROGS(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2)
......@@ -181,6 +191,7 @@ outfiles="Makeconf GNUmakefile \
if test $WITH_EMULAB -eq 0; then
outfiles="$outfiles lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile"
else
AC_CONFIG_COMMANDS([lib], [rm -f lib; ln -s ../lib .])
......
......@@ -7,6 +7,7 @@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
......
......@@ -7009,7 +7009,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/idletimes db/idlemail db/xmlconvert \
db/libdb.py db/elabinelab_bossinit \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile lib/tmcd/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
os/imagezip/hashmap/GNUmakefile \
......
......@@ -874,7 +874,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/idletimes db/idlemail db/xmlconvert \
db/libdb.py db/elabinelab_bossinit \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile lib/tmcd/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
os/imagezip/hashmap/GNUmakefile \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment