Commit 93ed773b authored by Leigh Stoller's avatar Leigh Stoller

When --enable-events given, add events subdir to new optional_subdirs

variable, which is now references in the toplevel GNUmakefile.in file.
parent 86bfa38f
......@@ -10,7 +10,7 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
include Makeconf
SUBDIRS = lib assign discvr tbsetup db os security pxe tmcd utils www \
tip capture ipod vis
tip capture ipod vis @optional_subdirs@
all: all-subdirs
......
......@@ -807,6 +807,8 @@ fi
#
# These get defined in the definitions file (--with-TBDEFS).
# NB: See AC_DEFINE_UNQUOTED() calls below, if you want a variable
......@@ -1034,7 +1036,9 @@ fi
if test "$enable_events" = "yes"; then
eventfiles="event/GNUmakefile event/lib/GNUmakefile \
event/sched/GNUmakefile event/test/GNUmakefile \
event/tbgen/GNUmakefile event/tbgen/tbmevd.restart";
event/tbgen/GNUmakefile event/tbgen/tbmevd.restart \
event/example/GNUmakefile";
optional_subdirs="$optional_subdirs event";
else
eventfiles="";
fi
......@@ -1073,7 +1077,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1077: checking for a BSD compatible install" >&5
echo "configure:1080: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -1142,7 +1146,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/dhcpd_makeconf db/nodelog db/webnodelog db/unixgroups \
db/dbcheck db/interswitch db/dbboot \
ipod/GNUmakefile \
lib/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/frisbee.redux/GNUmakefile \
pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \
......@@ -1340,6 +1344,7 @@ s%@AR@%$AR%g
s%@RANLIB@%$RANLIB%g
s%@STRIP@%$STRIP%g
s%@SSH@%$SSH%g
s%@optional_subdirs@%$optional_subdirs%g
s%@TBDBNAME@%$TBDBNAME%g
s%@WWWDEFS@%$WWWDEFS%g
s%@TBADMINGROUP@%$TBADMINGROUP%g
......
......@@ -13,6 +13,8 @@ AC_CHECK_TOOL(RANLIB,ranlib)
AC_CHECK_TOOL(STRIP,strip)
AC_CHECK_TOOL(SSH,ssh)
AC_SUBST(optional_subdirs)
#
# These get defined in the definitions file (--with-TBDEFS).
# NB: See AC_DEFINE_UNQUOTED() calls below, if you want a variable
......@@ -179,7 +181,9 @@ AC_ARG_ENABLE(events,
if test "$enable_events" = "yes"; then
eventfiles="event/GNUmakefile event/lib/GNUmakefile \
event/sched/GNUmakefile event/test/GNUmakefile \
event/tbgen/GNUmakefile event/tbgen/tbmevd.restart";
event/tbgen/GNUmakefile event/tbgen/tbmevd.restart \
event/example/GNUmakefile";
optional_subdirs="$optional_subdirs event";
else
eventfiles="";
fi
......@@ -221,7 +225,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/dhcpd_makeconf db/nodelog db/webnodelog db/unixgroups \
db/dbcheck db/interswitch db/dbboot \
ipod/GNUmakefile \
lib/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/frisbee.redux/GNUmakefile \
pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \
......
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