Changeset 1464 for trunk/configure.ac


Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

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.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/configure.ac

    r1461 r1464  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[trunk],[coin-cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[trunk],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    4040
    4141#############################################################################
    42 #             Check which ThirdParty sources are available                  #
    43 #############################################################################
    44 
    45 AC_COIN_THIRDPARTY_SUBDIRS([ASL],[ThirdParty/ASL],[solvers/asl.h])
    46 AC_COIN_THIRDPARTY_SUBDIRS([Blas],[ThirdParty/Blas],[daxpy.f])
    47 AC_COIN_THIRDPARTY_SUBDIRS([Lapack],[ThirdParty/Lapack],[LAPACK/SRC/dlarf.f])
    48 AC_COIN_THIRDPARTY_SUBDIRS([Glpk],[ThirdParty/Glpk],[glpk/src/glplpx01.c])
    49 
    50 #############################################################################
    5142#                  Check which subprojects are there                        #
    5243#############################################################################
    5344
    54 AC_COIN_MAIN_SUBDIRS(CoinUtils)
    55 AC_COIN_MAIN_SUBDIRS(Data/Netlib)
    56 AC_COIN_MAIN_SUBDIRS(Data/Sample)
    57 AC_COIN_MAIN_SUBDIRS(Data/miplib3)
    58 AC_COIN_MAIN_SUBDIRS(Clp)
    59 AC_COIN_MAIN_SUBDIRS(DyLP)
    60 AC_COIN_MAIN_SUBDIRS(Vol)
    61 AC_COIN_MAIN_SUBDIRS(Osi)
    62 AC_COIN_MAIN_SUBDIRS(Cgl)
    63 AC_COIN_MAIN_SUBDIRS(Cbc)
    64 AC_COIN_MAIN_SUBDIRS(SYMPHONY)
     45AC_COIN_MAIN_PACKAGEDIR(Blas,ThirdParty,daxpy.f,coinblas)
     46AC_COIN_MAIN_PACKAGEDIR(Lapack,ThirdParty,[LAPACK/SRC/dlarf.f],coinlapack)
     47AC_COIN_MAIN_PACKAGEDIR(Sample,Data,,coindatasample)
     48AC_COIN_MAIN_PACKAGEDIR(Netlib,Data,,coindatanetlib)
     49AC_COIN_MAIN_PACKAGEDIR(miblib3,Data,,coindatamiplib3)
     50AC_COIN_MAIN_PACKAGEDIR(CoinUtils)
     51AC_COIN_MAIN_PACKAGEDIR(Osi)
     52AC_COIN_MAIN_PACKAGEDIR(Clp)
     53AC_COIN_MAIN_PACKAGEDIR(DyLP)
     54AC_COIN_MAIN_PACKAGEDIR(Vol)
     55AC_COIN_MAIN_PACKAGEDIR(Cgl)
     56AC_COIN_MAIN_PACKAGEDIR(Cbc)
    6557
    6658##############################################################################
Note: See TracChangeset for help on using the changeset viewer.