diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 5cc8be0a080b73247b4403848349f1b13b8f52b1..ae500eaeef99efa956b90d1d7442a84155de7352 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -40,6 +40,18 @@
 #error
 #endif
 
+int Get_GmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
+int Get_GmshMinorVersion(){ return GMSH_MINOR_VERSION; }
+int Get_GmshPatchVersion(){ return GMSH_PATCH_VERSION; }
+const char *Get_GmshExtraVersion(){ return GMSH_EXTRA_VERSION; }
+const char *Get_GmshVersion(){ return GMSH_VERSION; }
+const char *Get_GmshBuildDate(){ return GMSH_DATE; }
+const char *Get_GmshBuildHost(){ return GMSH_HOST; }
+const char *Get_GmshPackager(){ return GMSH_PACKAGER; }
+const char *Get_GmshBuildOS(){ return GMSH_OS; }
+const char *Get_GmshShortLicense(){ return GMSH_SHORT_LICENSE; }
+const char *Get_GmshBuildOptions(){ return GMSH_CONFIG_OPTIONS; }
+
 void Print_Usage(const char *name)
 {
   // If you make changes in this routine, please also change the
@@ -102,18 +114,6 @@ void Print_Usage(const char *name)
   Msg::Direct("  -help                 Show this message");
 }
 
-int Get_GmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
-int Get_GmshMinorVersion(){ return GMSH_MINOR_VERSION; }
-int Get_GmshPatchVersion(){ return GMSH_PATCH_VERSION; }
-const char *Get_GmshExtraVersion(){ return GMSH_EXTRA_VERSION; }
-const char *Get_GmshVersion(){ return GMSH_VERSION; }
-const char *Get_GmshBuildDate(){ return GMSH_DATE; }
-const char *Get_GmshBuildHost(){ return GMSH_HOST; }
-const char *Get_GmshPackager(){ return GMSH_PACKAGER; }
-const char *Get_GmshBuildOS(){ return GMSH_OS; }
-const char *Get_GmshShortLicense(){ return GMSH_SHORT_LICENSE; }
-std::string Get_GmshBuildOptions(){ return GMSH_CONFIG_OPTIONS; }
-
 void Get_Options(int argc, char *argv[])
 {
   // print messages on terminal
@@ -508,7 +508,7 @@ void Get_Options(int argc, char *argv[])
 #endif
         fprintf(stderr, "License        : %s\n", GMSH_SHORT_LICENSE);
         fprintf(stderr, "Build OS       : %s\n", GMSH_OS);
-        fprintf(stderr, "Build options  : %s\n", Get_GmshBuildOptions().c_str());
+        fprintf(stderr, "Build options  : %s\n", GMSH_CONFIG_OPTIONS);
         fprintf(stderr, "Build date     : %s\n", GMSH_DATE);
         fprintf(stderr, "Build host     : %s\n", GMSH_HOST);
         fprintf(stderr, "Packager       : %s\n", GMSH_PACKAGER);
diff --git a/Common/CommandLine.h b/Common/CommandLine.h
index a7d82b315299b258d57fc68eeef09131ffa29128..25e7dc210d1961585d115d039e6d92e37b9dc242 100644
--- a/Common/CommandLine.h
+++ b/Common/CommandLine.h
@@ -6,11 +6,6 @@
 #ifndef _COMMAND_LINE_H_
 #define _COMMAND_LINE_H_
 
-#include <string>
-
-void Get_Options(int argc, char *argv[]);
-void Print_Usage(const char *name);
-
 int Get_GmshMajorVersion();
 int Get_GmshMinorVersion();
 int Get_GmshPatchVersion();
@@ -21,6 +16,9 @@ const char *Get_GmshBuildHost();
 const char *Get_GmshPackager();
 const char *Get_GmshBuildOS();
 const char *Get_GmshShortLicense();
-std::string Get_GmshBuildOptions();
+const char *Get_GmshBuildOptions();
+
+void Print_Usage(const char *name);
+void Get_Options(int argc, char *argv[]);
 
 #endif
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index 57c4ab40bab2f7f2182f13645bdab2842ca4a854..cb63ab493178ac75a410f65c450796491a5e053d 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
   Msg::Info("-------------------------------------------------------");
   Msg::Info("Gmsh version   : %s", Get_GmshVersion());
   Msg::Info("Build OS       : %s", Get_GmshBuildOS());
-  Msg::Info("Build options  : %s", Get_GmshBuildOptions().c_str());
+  Msg::Info("Build options  : %s", Get_GmshBuildOptions());
   Msg::Info("Build date     : %s", Get_GmshBuildDate());
   Msg::Info("Build host     : %s", Get_GmshBuildHost());
   Msg::Info("Packager       : %s", Get_GmshPackager());
diff --git a/configure b/configure
index debf99efb4f5a80750e3f65c89f7e6ae23533d2c..aea571b55ff4e01f4427e182d0be56713a77d89c 100755
--- a/configure
+++ b/configure
@@ -5879,6 +5879,13 @@ if test "x${BLAS_LIBS}" != "x"; then
   else
     GMSH_LIBS="${GMSH_LIBS} ${BLAS_LIBS}"
   fi
+  case "$UNAME" in
+    Darwin*)
+      ;;
+    *)
+      GMSH_LIBS="${GMSH_LIBS} ${F77LIB}"
+      ;;
+  esac
 fi
 
 if test "x$enable_mpi" = "xyes"; then
diff --git a/configure.in b/configure.in
index b045346381b892337a2ac21a7afa3767d0e09b2d..97bb7b4670e54123263d96af6797068eec4fe18f 100644
--- a/configure.in
+++ b/configure.in
@@ -746,6 +746,13 @@ if test "x${BLAS_LIBS}" != "x"; then
   else
     GMSH_LIBS="${GMSH_LIBS} ${BLAS_LIBS}"
   fi
+  case "$UNAME" in
+    Darwin*)
+      ;;
+    *)
+      GMSH_LIBS="${GMSH_LIBS} ${F77LIB}"
+      ;;
+  esac
 fi
 
 dnl Check for MPI
diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc
index 95bc48a680dfaf77584c4ad2194ed0119db8691d..baadba553b123bf338477d439fc045fbd0fc59d1 100644
--- a/utils/misc/variables.msvc
+++ b/utils/misc/variables.msvc
@@ -26,6 +26,7 @@ endif
 
 # Change the following to select which version to build:
 ENABLE_GUI=0
+ENABLE_BLAS_LAPACK=1
 ENABLE_PARSER=1
 ENABLE_POSTPRO=1
 ENABLE_TETGEN=1
@@ -37,6 +38,9 @@ ENABLE_MED=0
 # If you selected ENABLE_GUI, specify where FLTK is installed
 FLTK_PREFIX="E:/src/fltk-1.1.9"
 
+# If you selected ENABLE_BLAS_LAPACK, specify where Blas/Lapack are installed
+BLAS_LAPACK_PREFIX="E:/src/blaslapack"
+
 # If you selected ENABLE_OCC, specify where OpenCASCADE is installed
 ifneq ($(CASROOT),)
   OCC_PREFIX="${CASROOT}"
@@ -113,6 +117,13 @@ ifeq (${ENABLE_METIS},1)
   FLAGS+=/DHAVE_METIS
   GMSH_DIRS+=contrib/Metis
 endif
+
+ifeq (${ENABLE_BLAS_LAPACK},1)
+  FLAGS+=/DHAVE_BLAS /DHAVE_LAPACK
+  GMSH_LIBS+=${BLAS_LAPACK_PREFIX}/liblapack.lib
+  GMSH_LIBS+=${BLAS_LAPACK_PREFIX}/libblas.lib
+endif
+
 ifeq (${ENABLE_OCC},1)
   FLAGS+=/DHAVE_OCC /DHAVE_NO_OCC_CONFIG_H /DWNT /I${OCC_PREFIX}/inc
   GMSH_LIBS+=${OCC_PREFIX}/win32/bin/*.lib