Commit 4666a4ef authored by obm's avatar obm

Some minor changes to configure environment:

1)New wrapper for configure script now also outputs the help of install/configure when called with --help
2)A quick and dirty trick to make configure recognise MKL 10.x series in ia32 and x86_64 machines. Although
I have tested this on every machine I have my hands upon, would you be kind enough to check this more
throughly? Please note that some features of MKL 10 is not supported in MACOSX.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@6104 c92efa57-630b-4861-b058-cf58834340f0
parent b6d58a21
......@@ -18,6 +18,9 @@ MANUAL=" Usage
After configuration, the make.sys file will created in the
QE home (current) directory
---------------------------------------------------------------
Manual from autoconf configure :
---------------------------------------------------------------
"
#
#================================================================
......@@ -33,7 +36,7 @@ if [ "$auxdir" != "configure" ] ; then cd $auxdir ; fi
# detect the simplest cases
#
case $1 in
("-h" | "--help" ) echo "$MANUAL" ; exit 0 ;;
("-h" | "--help" ) echo "$MANUAL" ; ./install/configure --help ; exit 0 ;;
esac
#
......
......@@ -6450,12 +6450,20 @@ cat >conftest.$ac_ext <<_ACEOF
call dgemm
end
_ACEOF
for ac_lib in '' mkl_em64t; do
for ac_lib in '' mkl_em64t mkl_v10; do
if test -z "$ac_lib"; then
ac_res="none required"
else
case $ac_lib in
mkl_em64t)
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
;;
mkl_v10)
ac_res="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread"
LIBS="$ac_res $ac_func_search_save_LIBS"
;;
esac
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
......@@ -6542,13 +6550,22 @@ cat >conftest.$ac_ext <<_ACEOF
call dgemm
end
_ACEOF
for ac_lib in '' mkl_ia32; do
for ac_lib in '' mkl_ia32 mkl_v10; do
if test -z "$ac_lib"; then
ac_res="none required"
else
case $ac_lib in
mkl_ia32)
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
;;
mkl_v10)
ac_res="-lmkl_intel -lmkl_sequential -lmkl_core -lpthread"
LIBS="$ac_res $ac_func_search_save_LIBS"
;;
esac
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment