CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in autoconf scripts.

Browse Source
This commit is contained in:
Osei-Kuffuor 2016-02-12 09:36:40 -08:00
parent 2ef505bbc3
commit bc74630700
3 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/config/hypre_blas_macros.m4
View File

@ -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=<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

17
src/config/hypre_lapack_macros.m4
View File

@ -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

28
src/configure vendored
View File

@ -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