1.1 --- a/scripts/bootstrap.sh	Sun Feb 28 20:52:08 2010 +0100
     1.2 +++ b/scripts/bootstrap.sh	Mon Mar 01 07:51:45 2010 +0100
     1.3 @@ -44,6 +44,9 @@
     1.4  augment_config LEMON_INSTALL_PREFIX /usr/local \
     1.5      "# LEMON installation prefix"
     1.6  
     1.7 +augment_config GLPK_PREFIX /usr/local/ \
     1.8 +    "# GLPK installation root prefix"
     1.9 +
    1.10  augment_config COIN_OR_PREFIX /usr/local/coin-or \
    1.11      "# COIN-OR installation root prefix (used for CLP/CBC)"
    1.12  
    1.13 @@ -109,15 +112,26 @@
    1.14      valgrind_flags=''
    1.15  fi
    1.16  
    1.17 +if [ -f ${GLPK_PREFIX}/include/glpk.h ]; then
    1.18 +    if yesorno "Use GLPK" "y"
    1.19 +    then
    1.20 +        glpk_flag="--with-glpk=$GLPK_PREFIX"
    1.21 +    else
    1.22 +        glpk_flag="--without-glpk"
    1.23 +    fi
    1.24 +else
    1.25 +    glpk_flag="--without-glpk"        
    1.26 +fi
    1.27 +
    1.28  if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then
    1.29      if yesorno "Use COIN-OR (CBC/CLP)" "n"
    1.30      then
    1.31          coin_flag="--with-coin=$COIN_OR_PREFIX"
    1.32      else
    1.33 -        coin_flag=""
    1.34 +        coin_flag="--without-coin"
    1.35      fi
    1.36  else
    1.37 -    coin_flag=""        
    1.38 +    coin_flag="--without-coin"        
    1.39  fi
    1.40  
    1.41  if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then
    1.42 @@ -125,10 +139,10 @@
    1.43      then
    1.44          soplex_flag="--with-soplex=$SOPLEX_PREFIX"
    1.45      else
    1.46 -        soplex_flag=""
    1.47 +        soplex_flag="--without-soplex"
    1.48      fi
    1.49  else
    1.50 -    soplex_flag=""
    1.51 +    soplex_flag="--without-soplex"
    1.52  fi
    1.53  
    1.54  if [ "x$AUTORE" == "xyes" ]; then
    1.55 @@ -137,6 +151,7 @@
    1.56  ${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \
    1.57  $valgrind_flags \
    1.58  "$cxx_flags" \
    1.59 +$glpk_flag \
    1.60  $coin_flag \
    1.61  $soplex_flag \
    1.62  $*