diff --git a/src/config/hypre_blas_macros.m4 b/src/config/hypre_blas_macros.m4 index 4c34609c7..06f2e9cb7 100644 --- a/src/config/hypre_blas_macros.m4 +++ b/src/config/hypre_blas_macros.m4 @@ -205,16 +205,19 @@ dnl check that the provided path is correct. dnl *****************************************************************************************],[9]) dnl fi -dnl if [[ $blas_lib = /* ]] ; -dnl then + [libsuffix=${blas_lib##*.}] + SUFFIXES="$SUFFIXES $libsuffix" + if test "$libsuffix" = "a" -o "$libsuffix" = "so" ; + then dnl if test -f $blas_lib; dnl then -dnl [dir_path=${blas_lib%/*}] -dnl BLASLIBPATHS="$BLASLIBPATHS -L$dir_path" -dnl [blas_lib_name=${blas_lib_name%.*}] -dnl [blas_lib_name=${blas_lib_name##*/}] -dnl [blas_lib_name=${blas_lib_name#*lib}] -dnl BLASLIBNAMES="$BLASLIBNAMES $blas_lib_name" + [dir_path=${blas_lib#*/}] + [dir_path=${blas_lib%/*}] + BLASLIBPATHS="$BLASLIBPATHS -L/$dir_path" + [blas_lib_name=${blas_lib_name%.*}] + [blas_lib_name=${blas_lib_name##*/}] + [blas_lib_name=${blas_lib_name#*lib}] + BLASLIBNAMES="$BLASLIBNAMES $blas_lib_name" dnl else dnl AC_MSG_ERROR([**************** Invalid path to blas library error: *************************** dnl User set BLAS library path using either --with-blas-lib=, or @@ -224,9 +227,9 @@ dnl in the user-provided path for --with-blas-libs does not exist. dnl check that the provided path is correct. dnl *****************************************************************************************],[9]) dnl fi -dnl else + else BLASLIBPATHS="$dir_path $BLASLIBPATHS" -dnl fi + fi else BLASLIBNAMES="$BLASLIBNAMES $blas_lib_name" fi diff --git a/src/config/hypre_lapack_macros.m4 b/src/config/hypre_lapack_macros.m4 index 5c7f63f51..b5935f02a 100644 --- a/src/config/hypre_lapack_macros.m4 +++ b/src/config/hypre_lapack_macros.m4 @@ -192,7 +192,22 @@ dnl check that the provided path is correct. dnl *****************************************************************************************],[9]) dnl fi - LAPACKLIBPATHS="$dir_path $LAPACKLIBPATHS" + [libsuffix=${lapack_lib##*.}] + SUFFIXES="$SUFFIXES $libsuffix" + if test "$libsuffix" = "a" -o "$libsuffix" = "so" ; + then +dnl if test -f $lapack_lib; +dnl then + [dir_path=${lapack_lib#*/}] + [dir_path=${lapack_lib%/*}] + LAPACKLIBPATHS="$LAPACKLIBPATHS -L/$dir_path" + [lapack_lib_name=${lapack_lib_name%.*}] + [lapack_lib_name=${lapack_lib_name##*/}] + [lapack_lib_name=${lapack_lib_name#*lib}] + LAPACKLIBNAMES="$LAPACKLIBNAMES $lapack_lib_name" + else + LAPACKLIBPATHS="$dir_path $LAPACKLIBPATHS" + fi else LAPACKLIBNAMES="$LAPACKLIBNAMES $lapack_lib_name" fi diff --git a/src/configure b/src/configure index df04be43b..f9b201466 100755 --- a/src/configure +++ b/src/configure @@ -7181,7 +7181,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test $blas_lib = $blas_lib_name; then + libsuffix=${blas_lib##*.} + SUFFIXES="$SUFFIXES $libsuffix" + if test "$libsuffix" = "a" -o "$libsuffix" = "so" ; + then + dir_path=${blas_lib#*/} + dir_path=${blas_lib%/*} + BLASLIBPATHS="$BLASLIBPATHS -L/$dir_path" + blas_lib_name=${blas_lib_name%.*} + blas_lib_name=${blas_lib_name##*/} + blas_lib_name=${blas_lib_name#*lib} + BLASLIBNAMES="$BLASLIBNAMES $blas_lib_name" + else BLASLIBPATHS="$dir_path $BLASLIBPATHS" + fi else BLASLIBNAMES="$BLASLIBNAMES $blas_lib_name" fi @@ -7315,7 +7328,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test $lapack_lib = $lapack_lib_name; then - LAPACKLIBPATHS="$dir_path $LAPACKLIBPATHS" + libsuffix=${lapack_lib##*.} + SUFFIXES="$SUFFIXES $libsuffix" + if test "$libsuffix" = "a" -o "$libsuffix" = "so" ; + then + dir_path=${lapack_lib#*/} + dir_path=${lapack_lib%/*} + LAPACKLIBPATHS="$LAPACKLIBPATHS -L/$dir_path" + lapack_lib_name=${lapack_lib_name%.*} + lapack_lib_name=${lapack_lib_name##*/} + lapack_lib_name=${lapack_lib_name#*lib} + LAPACKLIBNAMES="$LAPACKLIBNAMES $lapack_lib_name" + else + LAPACKLIBPATHS="$dir_path $LAPACKLIBPATHS" + fi else LAPACKLIBNAMES="$LAPACKLIBNAMES $lapack_lib_name" fi