Commit 99ccf10e authored by Leigh Stoller's avatar Leigh Stoller

Give UNIFIED_BOSS_AND_OPS a default value so its get properly substitued.

parent ba2b1459
......@@ -871,6 +871,7 @@ fi
#
......@@ -917,6 +918,8 @@ PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns"
BOSSEVENTPORT=2927
UNIFIED_BOSS_AND_OPS=0
#
# Okay, I know this is improper usage of --with. Too bad.
......@@ -984,10 +987,6 @@ cat >> confdefs.h <<EOF
#define FSNODE "$FSNODE"
EOF
cat >> confdefs.h <<EOF
#define EVENTSERVER "$EVENTSERVER"
EOF
cat >> confdefs.h <<EOF
#define FSDIR_PROJ "$FSDIR_PROJ"
EOF
......@@ -1006,6 +1005,10 @@ if test -n "$FSDIR_SHARE"; then
EOF
fi
cat >> confdefs.h <<EOF
#define BOSSEVENTPORT "$BOSSEVENTPORT"
EOF
if test $PLABSUPPORT -eq 1; then
if test "$PLAB_ROOTBALL" = "change.me"; then
......@@ -1098,6 +1101,10 @@ fi
if test -z "$EVENTSERVER"; then
EVENTSERVER="$BOSSNODE"
fi
cat >> confdefs.h <<EOF
#define EVENTSERVER "$EVENTSERVER"
EOF
#
# LEDA library path
......@@ -1241,6 +1248,7 @@ if test "$enable_events" = "no"; then
EVENTSYS=0;
else
eventfiles="event/GNUmakefile event/lib/GNUmakefile \
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/sched/GNUmakefile event/test/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \
......@@ -1326,7 +1334,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:1330: checking for a BSD compatible install" >&5
echo "configure:1337: 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
......@@ -1667,6 +1675,7 @@ s%@BOSSNODE@%$BOSSNODE%g
s%@USERNODE@%$USERNODE%g
s%@FSNODE@%$FSNODE%g
s%@EVENTSERVER@%$EVENTSERVER%g
s%@BOSSEVENTPORT@%$BOSSEVENTPORT%g
s%@OURDOMAIN@%$OURDOMAIN%g
s%@FSDIR_PROJ@%$FSDIR_PROJ%g
s%@FSDIR_GROUPS@%$FSDIR_GROUPS%g
......
......@@ -30,6 +30,7 @@ AC_SUBST(BOSSNODE)
AC_SUBST(USERNODE)
AC_SUBST(FSNODE)
AC_SUBST(EVENTSERVER)
AC_SUBST(BOSSEVENTPORT)
AC_SUBST(OURDOMAIN)
AC_SUBST(FSDIR_PROJ)
AC_SUBST(FSDIR_GROUPS)
......@@ -109,6 +110,8 @@ PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns"
BOSSEVENTPORT=2927
UNIFIED_BOSS_AND_OPS=0
#
# Okay, I know this is improper usage of --with. Too bad.
......@@ -147,13 +150,13 @@ AC_DEFINE_UNQUOTED(JAILIPMASK, "$JAILIPMASK")
AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE")
AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE")
AC_DEFINE_UNQUOTED(FSNODE, "$FSNODE")
AC_DEFINE_UNQUOTED(EVENTSERVER, "$EVENTSERVER")
AC_DEFINE_UNQUOTED(FSDIR_PROJ, "$FSDIR_PROJ")
AC_DEFINE_UNQUOTED(FSDIR_GROUPS, "$FSDIR_GROUPS")
AC_DEFINE_UNQUOTED(FSDIR_USERS, "$FSDIR_USERS")
if test -n "$FSDIR_SHARE"; then
AC_DEFINE_UNQUOTED(FSDIR_SHARE, "$FSDIR_SHARE")
fi
AC_DEFINE_UNQUOTED(BOSSEVENTPORT, "$BOSSEVENTPORT")
if test $PLABSUPPORT -eq 1; then
if test "$PLAB_ROOTBALL" = "change.me"; then
......@@ -242,6 +245,7 @@ fi
if test -z "$EVENTSERVER"; then
EVENTSERVER="$BOSSNODE"
fi
AC_DEFINE_UNQUOTED(EVENTSERVER, "$EVENTSERVER")
#
# LEDA library path
......@@ -353,6 +357,7 @@ if test "$enable_events" = "no"; then
EVENTSYS=0;
else
eventfiles="event/GNUmakefile event/lib/GNUmakefile \
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/sched/GNUmakefile event/test/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \
......
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