Changeset 2103


Ignore:
Timestamp:
Feb 19, 2011 9:30:34 AM (9 years ago)
Author:
stefan
Message:

merge chgset 2097,2101,2102 from trunk

Location:
stable/0.6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/coin.m4

    r2100 r2103  
    38233823fi
    38243824
    3825 if test $m4_tolower(coin_has_$1) != skipping; then
     3825if test "$m4_tolower(coin_has_$1)" != skipping; then
    38263826  if test $PACKAGE_TARNAME = m4_tolower($1); then
    38273827    m4_tolower(coin_has_$1)=yes
     
    43064306    #   replace "Cflags:" by "echo projcflags="
    43074307    #   remove every line starting with <some word>:
    4308     [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
     4308    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
    43094309
    43104310    # set projcflags and projlibs variables by running $pcfilemod
     
    43514351    #   replace "Cflags:" by "echo projcflags="
    43524352    #   remove every line starting with <some word>:
    4353     [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
     4353    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
    43544354
    43554355    # set projcflags and projlibs variables by running $pcfilemod
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.6/share/config.site

    r291 r2103  
    266266# --with-LIB-incdir and --with-LIB-lib configure flags, where "LIB" is
    267267# replaced by the lower-case short-form of the library.  A possibly
    268 # incomplete list of choices for LIB in the current COIN projects is:
    269 # cplex, glpk, gmpl, fortmp, mosek, mpi, osl, soplex, xpress.
     268# incomplete list of choices for LIB in the current COIN-OR projects is:
     269# cplex, gurobi, mosek, soplex, xpress.
    270270# For Cplex, one might set the following:
    271271#with_cplex_incdir='/usr/ilog/cplex90/include/ilcplex'
     
    307307# Specify that Lapack should not be used
    308308#with_lapack=no
    309 
    310 ### ASL
    311 # Flag indicating where to find the AMPL Solver Library.  If --with-asldir
    312 # is not used, the configure script will test for the source code for ASL
    313 # in ThirdParty/ASL.  If this is found there, the ASL will be automatically
    314 # compiled and used, otherwise, it is assumed that ASL is unavailable.
    315 # If the user already has a precompiled version of the ASL, (s)he can use
    316 # this flag to specify the directory will all headers and the library:
    317 #with_asldir=$HOME/ampl/solvers
    318 
Note: See TracChangeset for help on using the changeset viewer.