Changeset 1538 for branches


Ignore:
Timestamp:
Apr 30, 2010 9:44:33 AM (10 years ago)
Author:
stefan
Message:

fix blas and lapack scripts; add conditional and subst for pkg-config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/split/coin.m4

    r1537 r1538  
    34023402  fi
    34033403fi
     3404
     3405AM_CONDITIONAL([COIN_HAS_PKGCONFIG], [test -n "$PKG_CONFIG"])
     3406AC_SUBST(PKG_CONFIG)
     3407
    34043408])
    34053409
     
    39753979if test "x$use_blas" = xBUILD ; then
    39763980  if test -d ../ThirdParty/Blas ; then
    3977     AC_COIN_HAS_MODULE(Blas, [coinblas], [], [../ThirdParty/Blas])
    3978   elif test -d ../Blas ; then
    3979     AC_COIN_HAS_MODULE(Blas, [coinblas], [], [../Blas])
    3980   fi
     3981    blasdir=../ThirdParty/Blas
     3982  else
     3983    blasdir=../Blas
     3984  fi
     3985  AC_COIN_HAS_MODULE(Blas, [coinblas], [], [$blasdir])
    39813986 
    39823987elif test "x$use_blas" != x && test "$use_blas" != no; then
     
    41124117if test "x$use_lapack" = xBUILD ; then
    41134118  if test -d ../ThirdParty/Lapack ; then
    4114     AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [../ThirdParty/Lapack])
    4115   elif test -d ../Lapack ; then
    4116     AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [../Lapack])
    4117   fi
     4119    lapackdir=../ThirdParty/Lapack
     4120  else
     4121    lapackdir=../Lapack
     4122  fi
     4123  AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [$lapackdir])
    41184124 
    41194125elif test "x$use_lapack" != x && test "$use_lapack" != no; then
Note: See TracChangeset for help on using the changeset viewer.