Ignore:
Timestamp:
Nov 13, 2010 2:04:20 PM (9 years ago)
Author:
tkr
Message:

Merging r1530 from stable/2.6

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Cbc

  • trunk/Cbc/configure.ac

    r1524 r1531  
    8383AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp],   [CbcGeneric])
    8484AC_COIN_CHECK_PACKAGE(Vol,  [osi-vol])
    85 AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcGeneric])
     85AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcLib CbcGeneric])
    8686AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk],   [CbcGeneric])
    8787AC_COIN_CHECK_PACKAGE(Grb,  [osi-gurobi])
Note: See TracChangeset for help on using the changeset viewer.