Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/configure.ac

    r1557 r1559  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Clp],[trunk],[coin-clp@list.coin-or.org])
     15AC_INIT([Clp],[trunk],[clp@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    2323# List one file in the package so that the configure script can test
    2424# whether the package is actually there
    25 AC_CONFIG_SRCDIR(src/ClpCholeskyBase.cpp)
     25AC_CONFIG_SRCDIR(src/ClpSimplex.cpp)
    2626
    2727# Where should everything be installed by default?  Here, we want it
     
    5454
    5555#############################################################################
    56 #                              COIN components                              #
     56#                              COIN-OR components                           #
    5757#############################################################################
    5858
    59 AC_COIN_HAS_PROJECT(CoinUtils)
    60 AC_COIN_HAS_PROJECT(Clp)
     59AC_COIN_HAS_MODULE(CoinUtils, [coinutils = trunk])
     60if 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])
     66fi
     67AC_COIN_HAS_MODULE_FALLBACK(CoinUtils, [coinutils], [../CoinUtils])
     68if test $coin_has_coinutils != yes ; then
     69  AC_MSG_ERROR([Required package CoinUtils not available.])
     70fi
     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
     73COINUTILS_LIBS="$COINUTILS_LIBS $BLAS_LIBS $LAPACK_LIBS"
     74
     75AC_COIN_HAS_MODULE(Osi,      [osi],            [required=0], [../Osi])
     76AC_COIN_HAS_MODULE(OsiTests, [osi-unittests],  [required=0], [../Osi])
     77AC_COIN_HAS_MODULE(Sample,   [coindatasample], [required=0], [../Data/Sample])
     78AC_COIN_HAS_MODULE(Netlib,   [coindatanetlib], [required=0], [../Data/Netlib])
    6179
    6280#############################################################################
     
    126144                 examples/Makefile
    127145                 src/Makefile
     146                 src/OsiClp/Makefile
    128147                 test/Makefile
    129                  clp_addlibs.txt])
     148                 clp.pc
     149                 clp-uninstalled.pc])
     150                 
     151if test $coin_has_osi = yes ; then
     152  AC_CONFIG_FILES([src/OsiClp/osi-clp.pc
     153                   osi-clp-uninstalled.pc:src/OsiClp/osi-clp-uninstalled.pc.in])
     154fi
    130155
    131156# Here put the location and name of the configuration header file
Note: See TracChangeset for help on using the changeset viewer.