Changeset 1559 for trunk/configure.ac


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (10 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/configure.ac

    r1557 r1559  
    4040
    4141#############################################################################
    42 #             Check which ThirdParty sources are available                  #
    43 #############################################################################
    44 
    45 AC_COIN_THIRDPARTY_SUBDIRS([Blas],[ThirdParty/Blas],[daxpy.f])
    46 AC_COIN_THIRDPARTY_SUBDIRS([Lapack],[ThirdParty/Lapack],[LAPACK/SRC/dlarf.f])
    47 
    48 #############################################################################
    4942#                  Check which subprojects are there                        #
    5043#############################################################################
    5144
    52 AC_COIN_MAIN_SUBDIRS(CoinUtils)
    53 AC_COIN_MAIN_SUBDIRS(Data/Sample)
    54 AC_COIN_MAIN_SUBDIRS(Data/Netlib)
    55 AC_COIN_MAIN_SUBDIRS(Clp)
     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(CoinUtils)
     50AC_COIN_MAIN_PACKAGEDIR(Clp)
    5651
    5752##############################################################################
Note: See TracChangeset for help on using the changeset viewer.