Ignore:
Timestamp:
Jul 25, 2010 3:57:53 PM (10 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/Clp/configure.ac

    r1564 r1580  
    5858
    5959AC_COIN_HAS_MODULE(CoinUtils, [coinutils = trunk])
    60 if test $coin_has_coinutils != 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 and ThirdParty/Lapack 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 fi
    67 AC_COIN_HAS_MODULE_FALLBACK(CoinUtils, [coinutils], [../CoinUtils])
    68 if test $coin_has_coinutils != yes ; then
    69   AC_MSG_ERROR([Required package CoinUtils not available.])
    70 fi
    71 #so if we had to do find Blas and Lapack separately, then add their linker flags to the CoinUtils flags
    72 #actually the libs may already be included in libCoinUtils, but we may still need the fortran library flags
    73 COINUTILS_LIBS="$COINUTILS_LIBS $LAPACK_LIBS $BLAS_LIBS"
    74 
    75 AC_COIN_HAS_MODULE(Osi,      [osi],            [required=0], [../Osi])
    76 AC_COIN_HAS_MODULE(OsiTests, [osi-unittests],  [required=0], [../Osi])
    77 AC_COIN_HAS_MODULE(Sample,   [coindatasample], [required=0], [../Data/Sample])
    78 AC_COIN_HAS_MODULE(Netlib,   [coindatanetlib], [required=0], [../Data/Netlib])
     60AC_COIN_HAS_MODULE(Osi,       [osi],            [required=0], [../Osi])
     61AC_COIN_HAS_MODULE(OsiTests,  [osi-unittests],  [required=0], [../Osi])
     62AC_COIN_HAS_MODULE(Sample,    [coindatasample], [required=0], [../Data/Sample])
     63AC_COIN_HAS_MODULE(Netlib,    [coindatanetlib], [required=0], [../Data/Netlib])
    7964
    8065#############################################################################
Note: See TracChangeset for help on using the changeset viewer.