Ignore:
Timestamp:
Nov 2, 2010 4:11:31 PM (9 years ago)
Author:
tkr
Message:

Making name changes to comply with recent changes in build tools and re-running the autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure.ac

    r1501 r1516  
    5757#############################################################################
    5858
    59 AC_COIN_HAS_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])
     59AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])
    6060if test $coin_has_coindepend != yes ; then
    6161  AC_MSG_ERROR([Required package CoinUtils, Osi, or Cgl not available.])
     
    6464# Clp and OsiClp are inseparable here.
    6565
    66 AC_COIN_HAS_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
     66AC_COIN_CHECK_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
    6767if test $coin_has_clp != yes ; then
    6868  AC_MSG_ERROR("Required package Clp unavailable.")
     
    7171# The rest are not required for linking against Cbc
    7272
    73 AC_COIN_HAS_PACKAGE(OsiTests, [osi-unittests])
    74 AC_COIN_HAS_PACKAGE(Sample,   [coindatasample])
    75 AC_COIN_HAS_PACKAGE(Netlib,   [coindatanetlib])
    76 AC_COIN_HAS_PACKAGE(Miplib3,  [coindatamiplib3])
     73AC_COIN_CHECK_PACKAGE(OsiTests, [osi-unittests])
     74AC_COIN_CHECK_PACKAGE(Sample,   [coindatasample])
     75AC_COIN_CHECK_PACKAGE(Netlib,   [coindatanetlib])
     76AC_COIN_CHECK_PACKAGE(Miplib3,  [coindatamiplib3])
    7777
    7878#############################################################################
     
    8181
    8282# Check which other LP solvers are available, some of them become a dependency of CbcGeneric
    83 AC_COIN_HAS_PACKAGE(DyLP, [osi-dylp],   [CbcGeneric])
    84 AC_COIN_HAS_PACKAGE(Vol,  [osi-vol])
    85 AC_COIN_HAS_PACKAGE(Cpx,  [osi-cplex],  [CbcGeneric])
    86 AC_COIN_HAS_PACKAGE(Glpk, [osi-glpk],   [CbcGeneric])
    87 AC_COIN_HAS_PACKAGE(Grb,  [osi-gurobi])
    88 AC_COIN_HAS_PACKAGE(Msk,  [osi-mosek],  [CbcGeneric])
    89 AC_COIN_HAS_PACKAGE(Spx,  [osi-soplex], [CbcGeneric])
    90 AC_COIN_HAS_PACKAGE(Xpr,  [osi-xpress])
     83AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp],   [CbcGeneric])
     84AC_COIN_CHECK_PACKAGE(Vol,  [osi-vol])
     85AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcGeneric])
     86AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk],   [CbcGeneric])
     87AC_COIN_CHECK_PACKAGE(Grb,  [osi-gurobi])
     88AC_COIN_CHECK_PACKAGE(Msk,  [osi-mosek],  [CbcGeneric])
     89AC_COIN_CHECK_PACKAGE(Spx,  [osi-soplex], [CbcGeneric])
     90AC_COIN_CHECK_PACKAGE(Xpr,  [osi-xpress])
    9191
    9292#############################################################################
     
    9595
    9696# Ampl Solver library
    97 AC_COIN_HAS_PACKAGE(ASL, [coinasl])
     97AC_COIN_CHECK_PACKAGE(ASL, [coinasl])
    9898
    9999#############################################################################
Note: See TracChangeset for help on using the changeset viewer.