Commit ff74756f authored by Leigh Stoller's avatar Leigh Stoller

Change last revision. Look for LEDA, and if it does not exist use

assign binary. Change name to --with-assignbinary as per Jay request.
parent 49f6d4ad
......@@ -17,7 +17,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-LEDA Specify LEDA path (/usr/testbed default)"
ac_help="$ac_help
--with-assign Specify assign binary (overrides LEDA, default off)"
--with-assignbinary Specify assign binary (overrides LEDA, default on)"
ac_help="$ac_help
--with-ssh-args Specify ssh arguments when running from testbed scripts "
ac_help="$ac_help
......@@ -945,7 +945,11 @@ if test "${with_LEDA+set}" = set; then
else
LEDA="$ac_default_prefix/LEDA/LEDA-4.0"
if test -d "$ac_default_prefix/LEDA/LEDA-4.0"; then
LEDA="$ac_default_prefix/LEDA/LEDA-4.0"
else
LEDA=""
fi
fi
......@@ -954,9 +958,9 @@ fi
#
# Override LEDA with assign binary.
#
# Check whether --with-assign or --without-assign was given.
if test "${with_assign+set}" = set; then
withval="$with_assign"
# Check whether --with-assignbinary or --without-assignbinary was given.
if test "${with_assignbinary+set}" = set; then
withval="$with_assignbinary"
if test "$withval" = "yes"; then
ASSIGN="assign.bin"
......@@ -968,7 +972,11 @@ if test "${with_assign+set}" = set; then
else
ASSIGN=""
if test "$LEDA" = ""; then
ASSIGN="assign.bin"
else
ASSIGN=""
fi
fi
......@@ -1105,7 +1113,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:1109: checking for a BSD compatible install" >&5
echo "configure:1117: 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
......
......@@ -111,15 +111,19 @@ AC_ARG_WITH(LEDA,
LEDA="$withval"
fi
],[
LEDA="$ac_default_prefix/LEDA/LEDA-4.0"
if test -d "$ac_default_prefix/LEDA/LEDA-4.0"; then
LEDA="$ac_default_prefix/LEDA/LEDA-4.0"
else
LEDA=""
fi
])
AC_SUBST(LEDA)
#
# Override LEDA with assign binary.
#
AC_ARG_WITH(assign,
[ --with-assign Specify assign binary (overrides LEDA, default off)],
AC_ARG_WITH(assignbinary,
[ --with-assignbinary Specify assign binary (overrides LEDA, default on)],
[
if test "$withval" = "yes"; then
ASSIGN="assign.bin"
......@@ -129,7 +133,11 @@ AC_ARG_WITH(assign,
LEDA=""
fi
],[
ASSIGN=""
if test "$LEDA" = ""; then
ASSIGN="assign.bin"
else
ASSIGN=""
fi
])
AC_SUBST(ASSIGN)
......
......@@ -55,9 +55,10 @@ library. In the meantime we will be working on removing our dependence
on the LEDA library.
The program in question is assign (see the assign subdir). Please
contact us if you need to replace it. When you configure your
testbed tree, be sure to add the --with-assign=/path/to/assign/binary.
See below.
contact us if you need to replace it. The default operation of
configure is to assume the existence of assign/assign.bin in the
source tree. However, you can override that by using the configure
option --with-assignbinary=/path/to/assign/binary.
##### Step 3 - Testbed tree configuration/installation
......@@ -114,8 +115,7 @@ Now, build and install the software. For example, I have the testbed source in
defs-ricci-emulab defs file in my home directory, I would do:
cd ~/tbobj
~/testbed/configure --with-TBDEFS=/users/ricci/testbed/defs-ricci-emulab \
--with-assign=/users/ricci/testbed/assign_binary
~/testbed/configure --with-TBDEFS=/users/ricci/testbed/defs-ricci-emulab
gmake
gmake boss-install
sudo gmake post-install
......
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