1.1 --- a/scripts/bootstrap.sh	Sun Oct 04 00:28:42 2009 +0200
     1.2 +++ b/scripts/bootstrap.sh	Mon Oct 05 09:48:57 2009 +0200
     1.3 @@ -47,6 +47,9 @@
     1.4  augment_config COIN_OR_PREFIX /usr/local/coin-or \
     1.5      "# COIN-OR installation root prefix (used for CLP/CBC)"
     1.6  
     1.7 +augment_config SOPLEX_PREFIX /usr/local/soplex \
     1.8 +    "# Soplex build prefix"
     1.9 +
    1.10  
    1.11  function ask() {
    1.12  echo -n "$1 [$2]? "
    1.13 @@ -99,13 +102,27 @@
    1.14  
    1.15  cxx_flags="CXXFLAGS=-ggdb$opt_flags$werror_flags"
    1.16  
    1.17 -if yesorno "Use COIN" "n"
    1.18 -then
    1.19 -    coin_flag="--with-coin=$COIN_OR_PREFIX"
    1.20 +if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then
    1.21 +    if yesorno "Use COIN-OR (CBC/CLP)" "n"
    1.22 +    then
    1.23 +        coin_flag="--with-coin=$COIN_OR_PREFIX"
    1.24 +    else
    1.25 +        coin_flag=""
    1.26 +    fi
    1.27  else
    1.28 -    coin_flag=""
    1.29 +    coin_flag=""        
    1.30  fi
    1.31  
    1.32 +if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then
    1.33 +    if yesorno "Use Soplex" "n"
    1.34 +    then
    1.35 +        soplex_flag="--with-soplex=$SOPLEX_PREFIX"
    1.36 +    else
    1.37 +        soplex_flag=""
    1.38 +    fi
    1.39 +else
    1.40 +    soplex_flag=""
    1.41 +fi
    1.42  
    1.43  if [ "x$AUTORE" == "xyes" ]; then
    1.44      autoreconf -vif;
    1.45 @@ -113,4 +130,5 @@
    1.46  ${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \
    1.47  "$cxx_flags" \
    1.48  $coin_flag \
    1.49 +$soplex_flag \
    1.50  $*