Changeset 2103 for stable

Timestamp:

Feb 19, 2011 9:30:34 AM (10 years ago)

Author:

stefan

Message:

merge chgset 2097,2101,2102 from trunk

Location:

stable/0.6

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (3 diffs)
• compile_f2c (modified) (1 prop)
• share/config.site (modified) (2 diffs)

stable/0.6/coin.m4

@@ -3823 +3823 @@
 fi
 
-if test $m4_tolower(coin_has_$1) != skipping; then
+if test "$m4_tolower(coin_has_$1)" != skipping; then
   if test $PACKAGE_TARNAME = m4_tolower($1); then
     m4_tolower(coin_has_$1)=yes
@@ -4306 +4306 @@
     #   replace "Cflags:" by "echo projcflags="
     #   remove every line starting with <some word>:
-    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
+    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
 
     # set projcflags and projlibs variables by running $pcfilemod
@@ -4351 +4351 @@
     #   replace "Cflags:" by "echo projcflags="
     #   remove every line starting with <some word>:
-    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
+    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
 
     # set projcflags and projlibs variables by running $pcfilemod

stable/0.6/share/config.site

@@ -266 +266 @@
 # --with-LIB-incdir and --with-LIB-lib configure flags, where "LIB" is
 # replaced by the lower-case short-form of the library.  A possibly
-# incomplete list of choices for LIB in the current COIN projects is:
-# cplex, glpk, gmpl, fortmp, mosek, mpi, osl, soplex, xpress.
+# incomplete list of choices for LIB in the current COIN-OR projects is:
+# cplex, gurobi, mosek, soplex, xpress.
 # For Cplex, one might set the following:
 #with_cplex_incdir='/usr/ilog/cplex90/include/ilcplex'
@@ -307 +307 @@
 # Specify that Lapack should not be used
 #with_lapack=no
-
-### ASL
-# Flag indicating where to find the AMPL Solver Library.  If --with-asldir
-# is not used, the configure script will test for the source code for ASL
-# in ThirdParty/ASL.  If this is found there, the ASL will be automatically
-# compiled and used, otherwise, it is assumed that ASL is unavailable.
-# If the user already has a precompiled version of the ASL, (s)he can use
-# this flag to specify the directory will all headers and the library:
-#with_asldir=$HOME/ampl/solvers
-