diff -r e4554cd6b2bf -r a42f46828cc1 scripts/bootstrap.sh --- a/scripts/bootstrap.sh Sun Oct 04 00:28:42 2009 +0200 +++ b/scripts/bootstrap.sh Mon Oct 05 09:48:57 2009 +0200 @@ -47,6 +47,9 @@ augment_config COIN_OR_PREFIX /usr/local/coin-or \ "# COIN-OR installation root prefix (used for CLP/CBC)" +augment_config SOPLEX_PREFIX /usr/local/soplex \ + "# Soplex build prefix" + function ask() { echo -n "$1 [$2]? " @@ -99,13 +102,27 @@ cxx_flags="CXXFLAGS=-ggdb$opt_flags$werror_flags" -if yesorno "Use COIN" "n" -then - coin_flag="--with-coin=$COIN_OR_PREFIX" +if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then + if yesorno "Use COIN-OR (CBC/CLP)" "n" + then + coin_flag="--with-coin=$COIN_OR_PREFIX" + else + coin_flag="" + fi else - coin_flag="" + coin_flag="" fi +if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then + if yesorno "Use Soplex" "n" + then + soplex_flag="--with-soplex=$SOPLEX_PREFIX" + else + soplex_flag="" + fi +else + soplex_flag="" +fi if [ "x$AUTORE" == "xyes" ]; then autoreconf -vif; @@ -113,4 +130,5 @@ ${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \ "$cxx_flags" \ $coin_flag \ +$soplex_flag \ $*