[Lemon-commits] Alpar Juttner: Configurable glpk prefix in ./scr...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/e77b621e6e7e
changeset: 923:e77b621e6e7e
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Mon Mar 01 07:51:45 2010 +0100
description:
	Configurable glpk prefix in ./scripts/bootstrap.sh and ... unneeded
	solver backends are explicitely switched off with --without-*

diffstat:

 scripts/bootstrap.sh |  23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diffs (63 lines):

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -44,6 +44,9 @@
 augment_config LEMON_INSTALL_PREFIX /usr/local \
     "# LEMON installation prefix"
 
+augment_config GLPK_PREFIX /usr/local/ \
+    "# GLPK installation root prefix"
+
 augment_config COIN_OR_PREFIX /usr/local/coin-or \
     "# COIN-OR installation root prefix (used for CLP/CBC)"
 
@@ -109,15 +112,26 @@
     valgrind_flags=''
 fi
 
+if [ -f ${GLPK_PREFIX}/include/glpk.h ]; then
+    if yesorno "Use GLPK" "y"
+    then
+        glpk_flag="--with-glpk=$GLPK_PREFIX"
+    else
+        glpk_flag="--without-glpk"
+    fi
+else
+    glpk_flag="--without-glpk"        
+fi
+
 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=""
+        coin_flag="--without-coin"
     fi
 else
-    coin_flag=""        
+    coin_flag="--without-coin"        
 fi
 
 if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then
@@ -125,10 +139,10 @@
     then
         soplex_flag="--with-soplex=$SOPLEX_PREFIX"
     else
-        soplex_flag=""
+        soplex_flag="--without-soplex"
     fi
 else
-    soplex_flag=""
+    soplex_flag="--without-soplex"
 fi
 
 if [ "x$AUTORE" == "xyes" ]; then
@@ -137,6 +151,7 @@
 ${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \
 $valgrind_flags \
 "$cxx_flags" \
+$glpk_flag \
 $coin_flag \
 $soplex_flag \
 $*