Merge branch 'develop' into sandybridge

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Lab of Parallel Software and Computational Science,ICSAS
+Copyright (c) 2011,2012 Lab of Parallel Software and Computational Science,ISCAS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -232,18 +232,27 @@ endif
 
 lapack-3.4.0 : lapack-3.4.0.tgz
 ifndef NOFORTRAN
+ifndef NO_LAPACK
 	@if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \
 		echo $(TAR) zxf $< ;\
 		$(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\
 	else \
-		echo "	lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\
 		rm -rf lapack-3.4.0 ;\
+		echo "	Cannot download lapack-3.4.0.tgz or the MD5 check sum is wrong (Please use orignal)."; \
+		exit 1; \
 	fi
 endif
+endif
+
+LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.0.tgz
 
 lapack-3.4.0.tgz :
 ifndef NOFORTRAN
-	-wget http://www.netlib.org/lapack/lapack-3.4.0.tgz
+ifeq ($(OSNAME), Darwin)
+	curl -O $(LAPACK_URL)
+else
+	wget $(LAPACK_URL)
+endif
 endif
 
 large.tgz : 

Makefile.system

@@ -101,6 +101,7 @@ DLLWRAP = $(CROSS_SUFFIX)dllwrap
 
 ifeq ($(OSNAME), Darwin)
 export MACOSX_DEPLOYMENT_TARGET=10.2
+MD5SUM = md5 -r
 endif
 
 ifeq ($(OSNAME), Linux)
@@ -651,7 +652,10 @@ PATCH	= patch
 GREP	= grep
 endif
 
+ifndef MD5SUM
 MD5SUM	= md5sum
+endif
+
 AWK	= awk
 
 REVISION = -r$(VERSION)