Merge branch 'develop'

This commit is contained in:
Zhang Xianyi 2013-07-26 01:34:45 +08:00
commit f26b7a08aa
1 changed files with 1 additions and 1 deletions

View File

@ -2676,7 +2676,7 @@ if ($ARGV[5] == 1) {
#NO_LAPACK=1
@underscore_objs = (@blasobjs, @misc_underscore_objs);
} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1" ||
-d "../lapack-3.4.2") {
-d "../lapack-3.4.2" || -d "../lapack-netlib") {
@underscore_objs = (@blasobjs, @lapackobjs, @lapackobjs2, @misc_underscore_objs);
} else {
@underscore_objs = (@blasobjs, @lapackobjs, @misc_underscore_objs);