Configure: fix the arpack third-party detection 02/17502/3
Clément DAVID [Thu, 26 Nov 2015 16:41:30 +0000 (17:41 +0100)]
This commit only modify the way ARPACK is detected when using the
Prerequirements svn repository.

Change-Id: Ib3adaaf2f4b4f5e1cb50959c86fb3254a9faa460

scilab/configure
scilab/m4/libsmath.m4

index 9d5fa20..638360c 100755 (executable)
@@ -28582,7 +28582,7 @@ $as_echo "$acx_blas_ok" >&6; }
         LIBS="$save_LIBS"
     elif $WITH_DEVTOOLS; then # Scilab thirdparties
         BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas"
-        BLAS_TYPE="Generic Blas"
+        BLAS_TYPE="Generic Blas (thirdparties)"
         acx_blas_ok=yes
     fi
 fi
@@ -29629,8 +29629,8 @@ $as_echo "$acx_lapack_ok" >&6; }
                 LAPACK_LIBS=""
         fi
 elif $WITH_DEVTOOLS; then # Scilab thirdparties
-     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack"
-     LAPACK_TYPE="Library -llapack"
+     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack -lblas"
+     LAPACK_TYPE="Lapack (thirdparties)"
      acx_lapack_ok=yes
 fi
 
@@ -29756,7 +29756,7 @@ LDFLAGS="$LDFLAGS -L$with_arpack_library"
 fi
 
 if $WITH_DEVTOOLS; then # Scilab thirdparties
-    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack"
+    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack -llapack -lblas"
     LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR"
     acx_arpack_ok=yes
 else
index 05304b2..4954e0b 100644 (file)
@@ -64,7 +64,7 @@ if test $acx_blas_ok = no; then
         LIBS="$save_LIBS"
     elif $WITH_DEVTOOLS; then # Scilab thirdparties
         BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas"
-        BLAS_TYPE="Generic Blas"
+        BLAS_TYPE="Generic Blas (thirdparties)"
         acx_blas_ok=yes
     fi
 fi
@@ -238,8 +238,8 @@ if test "x$LAPACK_LIBS" != x; then
                 LAPACK_LIBS=""
         fi
 elif $WITH_DEVTOOLS; then # Scilab thirdparties
-     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack"
-     LAPACK_TYPE="Library -llapack"
+     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack -lblas"
+     LAPACK_TYPE="Lapack (thirdparties)"
      acx_lapack_ok=yes
 fi
 
@@ -328,7 +328,7 @@ LDFLAGS="$LDFLAGS -L$with_arpack_library"
 fi
 
 if $WITH_DEVTOOLS; then # Scilab thirdparties
-    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack"
+    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack -llapack -lblas"
     LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR"
     acx_arpack_ok=yes
 else