Changeset 1538

Timestamp:

Apr 30, 2010 9:44:33 AM (11 years ago)

Author:

stefan

Message:

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

File:

• branches/split/coin.m4 (modified) (3 diffs)

branches/split/coin.m4

@@ -3402 +3402 @@
   fi
 fi
+
+AM_CONDITIONAL([COIN_HAS_PKGCONFIG], [test -n "$PKG_CONFIG"])
+AC_SUBST(PKG_CONFIG)
+
 ])
 
@@ -3975 +3979 @@
 if test "x$use_blas" = xBUILD ; then
   if test -d ../ThirdParty/Blas ; then
-    AC_COIN_HAS_MODULE(Blas, [coinblas], [], [../ThirdParty/Blas])
-  elif test -d ../Blas ; then
-    AC_COIN_HAS_MODULE(Blas, [coinblas], [], [../Blas])
-  fi
+    blasdir=../ThirdParty/Blas
+  else
+    blasdir=../Blas
+  fi
+  AC_COIN_HAS_MODULE(Blas, [coinblas], [], [$blasdir])
   
 elif test "x$use_blas" != x && test "$use_blas" != no; then
@@ -4112 +4117 @@
 if test "x$use_lapack" = xBUILD ; then
   if test -d ../ThirdParty/Lapack ; then
-    AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [../ThirdParty/Lapack])
-  elif test -d ../Lapack ; then
-    AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [../Lapack])
-  fi
+    lapackdir=../ThirdParty/Lapack
+  else
+    lapackdir=../Lapack
+  fi
+  AC_COIN_HAS_MODULE(Lapack, [coinlapack], [], [$lapackdir])
   
 elif test "x$use_lapack" != x && test "$use_lapack" != no; then