Ignore:
Timestamp:
Jul 25, 2010 3:58:37 PM (9 years ago)
Author:
stefan
Message:

COIN_HAS_MODULE_FALLBACK is now always called by COIN_HAS_MODULE and checks dependencies, thus simplify configure.ac; rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure.ac

    r1472 r1489  
    5959AC_COIN_HAS_MODULE(CoinDepend, [coinutils = trunk osi cgl])
    6060if test $coin_has_coindepend != yes ; then
    61   #if we have to use the fallback routines, then obviously it will not find CoinUtils dependencies
    62   #thus, we check whether ThirdParty/Blas, ThirdParty/Lapack, and ThirdParty/Glpk have been setup and
    63   #assume that if present then they are dependencies of CoinUtils
    64   AC_COIN_HAS_MODULE_FALLBACK(Blas,      [coinblas],   [../ThirdParty/Blas],   [required=0 dodefine=0 doconditional=0])
    65   AC_COIN_HAS_MODULE_FALLBACK(Lapack,    [coinlapack], [../ThirdParty/Lapack], [required=0 dodefine=0 doconditional=0])
    66   AC_COIN_HAS_MODULE_FALLBACK(Glpk,      [coinglpk],   [../ThirdParty/Glpk],   [required=0 dodefine=0 doconditional=0])
    67   AC_COIN_HAS_MODULE_FALLBACK(CoinUtils, [coinutils],  [../CoinUtils],         [dodefine=0 doconditional=0])
    68   AC_COIN_HAS_MODULE_FALLBACK(Osi,       [osi],        [../Osi],               [dodefine=0 doconditional=0])
    69   AC_COIN_HAS_MODULE_FALLBACK(Cgl,       [cgl],        [../Cgl],               [dodefine=0 doconditional=0])
    70   COINDEPEND_LIBS="$CGL_LIBS $OSI_LIBS $COINUTILS_LIBS $LAPACK_LIBS $BLAS_LIBS $GLPK_LIBS"
    71   COINDEPEND_CFLAGS="$COINUTILS_CFLAGS $GLPK_CFLAGS $OSI_CFLAGS $CGL_CFLAGS"
    72   if test "${coin_has_coinutils}${coin_has_osi}${coin_has_cgl}" = yesyesyes ; then
    73     coin_has_coindepend=yes
    74     AC_DEFINE(m4_toupper(COIN_HAS_COINDEPEND),[1],[Define to 1 if the COINDEPEND module is available])
    75     AM_CONDITIONAL(COIN_HAS_COINDEPEND, [test $coin_has_coindepend = yes])
    76   fi
    77 fi
    78 if test $coin_has_coindepend != yes ; then
    7961  AC_MSG_ERROR([Required package CoinUtils, Osi, or Cgl not available.])
    8062fi
     
    8264AC_COIN_HAS_MODULE(Clp, [osi-clp])
    8365if test $coin_has_clp != yes ; then
    84   # OsiClp depends on Clp
    85   # so if Clp is there, then we assume that also OsiClp will be there and add the corresponding flags to the Clp flags
    86   AC_COIN_HAS_MODULE_FALLBACK(Clp, [clp], [../Clp])
    87   if test $coin_has_clp = yes ; then
    88     AC_COIN_HAS_MODULE_FALLBACK(OsiClp, [osi-clp], [../Clp], [dodefine=0 doconditional=0])
    89     CLP_CFLAGS="$CLP_CFLAGS $OSICLP_CFLAGS"
    90     CLP_LIBS="$CLP_LIBS $OSICLP_LIBS"
    91   fi
    92 fi
    93 if test $coin_has_clp != yes ; then
    9466  AC_MSG_ERROR("Required package Clp unavailable.")
    9567fi
    9668
    97 # we skip fallbacks for the following two
    98 AC_COIN_HAS_MODULE(DyLP,     [osi-dylp])
    99 AC_COIN_HAS_MODULE(Vol,      [osi-vol])
    100 AC_COIN_HAS_MODULE(OsiTests, [osi-unittests], [required=0], [../Osi])
    101 
    102 AC_COIN_HAS_MODULE(Sample,  [coindatasample],  [required=0], [../Data/Sample])
    103 AC_COIN_HAS_MODULE(Netlib,  [coindatanetlib],  [required=0], [../Data/Netlib])
    104 AC_COIN_HAS_MODULE(Miplib3, [coindatamiplib3], [required=0], [../Data/Miplib3])
    105 
    106 #############################################################################
    107 #                            Third party solvers                            #
    108 #############################################################################
    109 
    110 # Check which third party solvers are available
     69AC_COIN_HAS_MODULE(OsiTests, [osi-unittests], [required=0])
     70
     71AC_COIN_HAS_MODULE(Sample,  [coindatasample],  [required=0])
     72AC_COIN_HAS_MODULE(Netlib,  [coindatanetlib],  [required=0])
     73AC_COIN_HAS_MODULE(Miplib3, [coindatamiplib3], [required=0])
     74
     75#############################################################################
     76#                    LP solvers other than CLP                              #
     77#############################################################################
     78
     79# Check which other LP solvers are available
     80AC_COIN_HAS_MODULE(DyLP, [osi-dylp])
     81AC_COIN_HAS_MODULE(Vol,  [osi-vol])
    11182AC_COIN_HAS_MODULE(Cpx,  [osi-cplex])
    11283AC_COIN_HAS_MODULE(Glpk, [osi-glpk])
     
    12192
    12293# Ampl Solver library
    123 AC_COIN_HAS_MODULE(ASL, [coinasl], [required=0], [../ThirdParty/ASL])
     94AC_COIN_HAS_MODULE(ASL, [coinasl], [required=0])
    12495
    12596#############################################################################
Note: See TracChangeset for help on using the changeset viewer.