Index: src/configure
===================================================================
--- src/configure	(revision 1739)
+++ src/configure	(working copy)
@@ -36,6 +36,8 @@
       -nosse      Do not optimize for the SSE family of vectorizations
       -altix      Use optimizations specific for the SGI Altix with intel
       -nolfs      Remove compile flags for Large File Support
+      -g95        Use g95 instead of gfortran when choosing gnu compilers
+      -macAccelerate Use optimized blas/lapack bundled with Mac OS X
 
     Rarely used/tested NAB options:
       -scalapack  Use ScaLAPACK for linear algebra (don't specify -mpi as well)
@@ -105,6 +107,8 @@
 fppflags="-P "
 freeformat_flag=''
 mdgx='no'
+macAccelerate='no'
+g95='no'
 
 #-------------------
 #  Platform specific: 
@@ -142,6 +146,8 @@
         -nosleap)      nosleap="true";;
         -3drism)       rism="yes";;
         -oldmkl)       oldmkl="yes";;
+        -macAccelerate) macAccelerate="yes";;
+        -g95)          g95="yes"; openmp="no"; ;;
         -help)         usage;;
         --help)         usage;;
 
@@ -305,6 +311,10 @@
       fi
     fi
 
+    if [ $g95 = "yes" ]; then
+       fc="g95 -fno-second-underscore"
+    fi
+
     if [ $openmp = "yes" ]; then
         omp_flag="-fopenmp -DOPENMP"
         flibs_arch="$flibs_arch -fopenmp"
@@ -561,6 +571,12 @@
     flibs="\$(LIBDIR)/carpack.a \$(LIBDIR)/clapack.a \$(LIBDIR)/f2c.a"
     flibsf="\$(LIBDIR)/carpack.a \$(LIBDIR)/lapack.a \$(LIBDIR)/f2c.a"
     flibs_goto="$GOTO -lpthread"
+elif [ $macAccelerate = "yes" -a $mkl = "no" ]; then
+    lapack=skip
+    blas=skip
+    flibs="\$(LIBDIR)/carpack.a \$(LIBDIR)/f2c.a"
+    flibsf="\$(LIBDIR)/carpack.a \$(LIBDIR)/f2c.a"
+    flibs_arch="-framework Accelerate"
 fi
 
 #--------------------------------------------------------------------------
@@ -742,7 +758,9 @@
 #------------------------------------------------------------------------------
 #  Set up the static flags:
 #------------------------------------------------------------------------------
-if [ $static = "yes" ]; then
+if [ `uname -s|awk '{print $1}'` = "Darwin"]; then
+    ldflags=""
+elif [ $static = "yes" ]; then
     flibs="$flibs $staticflag"
     ldflags="$staticflag"
 fi