r944:e77b621e6e7e
Mon, 01 Mar 2010 07:51:45
[Not Reviewed]
0 comments (0 inline)
0
1
0
| ... | ... |
@@ -46,2 +46,5 @@ |
| 46 | 46 |
|
| 47 |
augment_config GLPK_PREFIX /usr/local/ \ |
|
| 48 |
"# GLPK installation root prefix" |
|
| 49 |
|
|
| 47 | 50 |
augment_config COIN_OR_PREFIX /usr/local/coin-or \ |
| ... | ... |
@@ -111,2 +114,13 @@ |
| 111 | 114 |
|
| 115 |
if [ -f ${GLPK_PREFIX}/include/glpk.h ]; then
|
|
| 116 |
if yesorno "Use GLPK" "y" |
|
| 117 |
then |
|
| 118 |
glpk_flag="--with-glpk=$GLPK_PREFIX" |
|
| 119 |
else |
|
| 120 |
glpk_flag="--without-glpk" |
|
| 121 |
fi |
|
| 122 |
else |
|
| 123 |
glpk_flag="--without-glpk" |
|
| 124 |
fi |
|
| 125 |
|
|
| 112 | 126 |
if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then
|
| ... | ... |
@@ -116,6 +130,6 @@ |
| 116 | 130 |
else |
| 117 |
coin_flag="" |
|
| 131 |
coin_flag="--without-coin" |
|
| 118 | 132 |
fi |
| 119 | 133 |
else |
| 120 |
coin_flag="" |
|
| 134 |
coin_flag="--without-coin" |
|
| 121 | 135 |
fi |
| ... | ... |
@@ -127,6 +141,6 @@ |
| 127 | 141 |
else |
| 128 |
soplex_flag="" |
|
| 142 |
soplex_flag="--without-soplex" |
|
| 129 | 143 |
fi |
| 130 | 144 |
else |
| 131 |
soplex_flag="" |
|
| 145 |
soplex_flag="--without-soplex" |
|
| 132 | 146 |
fi |
| ... | ... |
@@ -139,2 +153,3 @@ |
| 139 | 153 |
"$cxx_flags" \ |
| 154 |
$glpk_flag \ |
|
| 140 | 155 |
$coin_flag \ |
0 comments (0 inline)