summaryrefslogtreecommitdiffstats
path: root/scilab/configure
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab-enterprises.com>2015-11-26 17:41:30 +0100
committerClement DAVID <clement.david@scilab-enterprises.com>2015-11-27 15:39:49 +0100
commitdcab0a142c861a4dd544977473b130e23588f966 (patch)
tree1655791a48ae5de7a46bba51c370eb3a5af9238f /scilab/configure
parent375f8fe4ef97a8d5b8595f4f8983c46923a7cb2c (diff)
downloadscilab-dcab0a142c861a4dd544977473b130e23588f966.zip
scilab-dcab0a142c861a4dd544977473b130e23588f966.tar.gz
Configure: fix the arpack third-party detection
This commit only modify the way ARPACK is detected when using the Prerequirements svn repository. Change-Id: Ib3adaaf2f4b4f5e1cb50959c86fb3254a9faa460
Diffstat (limited to 'scilab/configure')
-rwxr-xr-xscilab/configure8
1 files changed, 4 insertions, 4 deletions
diff --git a/scilab/configure b/scilab/configure
index 9d5fa20..638360c 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -28582,7 +28582,7 @@ $as_echo "$acx_blas_ok" >&6; }
28582 LIBS="$save_LIBS" 28582 LIBS="$save_LIBS"
28583 elif $WITH_DEVTOOLS; then # Scilab thirdparties 28583 elif $WITH_DEVTOOLS; then # Scilab thirdparties
28584 BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas" 28584 BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas"
28585 BLAS_TYPE="Generic Blas" 28585 BLAS_TYPE="Generic Blas (thirdparties)"
28586 acx_blas_ok=yes 28586 acx_blas_ok=yes
28587 fi 28587 fi
28588fi 28588fi
@@ -29629,8 +29629,8 @@ $as_echo "$acx_lapack_ok" >&6; }
29629 LAPACK_LIBS="" 29629 LAPACK_LIBS=""
29630 fi 29630 fi
29631elif $WITH_DEVTOOLS; then # Scilab thirdparties 29631elif $WITH_DEVTOOLS; then # Scilab thirdparties
29632 LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack" 29632 LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack -lblas"
29633 LAPACK_TYPE="Library -llapack" 29633 LAPACK_TYPE="Lapack (thirdparties)"
29634 acx_lapack_ok=yes 29634 acx_lapack_ok=yes
29635fi 29635fi
29636 29636
@@ -29756,7 +29756,7 @@ LDFLAGS="$LDFLAGS -L$with_arpack_library"
29756fi 29756fi
29757 29757
29758if $WITH_DEVTOOLS; then # Scilab thirdparties 29758if $WITH_DEVTOOLS; then # Scilab thirdparties
29759 ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack" 29759 ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack -llapack -lblas"
29760 LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR" 29760 LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR"
29761 acx_arpack_ok=yes 29761 acx_arpack_ok=yes
29762else 29762else