diff --git a/configure.ac b/configure.ac
index cb066feaa62f2dc24937b706b9658bbaec9c4bbf..fe0a3f7906860ca2f5cc98f1864d740132f8f659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_CONFIG_FILES([Makefile gnu-compat/Makefile
                  add_ons/libalbas/tests/Makefile
                  add_ons/block_solve/Makefile
 		 add_ons/block_solve/src/Makefile
+		 add_ons/block_solve/demo/Makefile
+		 add_ons/block_solve/demo/2d/Makefile
 		 add_ons/geomview/Makefile
 		 add_ons/grape/Makefile
 		 add_ons/grape/mesh/Makefile
@@ -149,6 +151,12 @@ AC_ARG_ENABLE([dim-of-world],
       ;;
 esac])
 
+ALBERTA_ENABLE_FLAG([fortran-blas],
+  [Use BLAS routines for some basis linear algebra stuff.],
+  [disabled],
+  [USE_F77_BLAS],
+  [DEFINE SUBST COND])
+
 ALBERTA_ENABLE_FLAG([vector-basis-functions],
   [Disable support for vector-valued basis functions. If you leave this enabled
   ALBERTA supports DIM_OF_WORLD-valued basis functions and scalar basis
@@ -310,7 +318,7 @@ if test "${BUILD_DEBUG_LIBS}" = "1"; then
 	fi
     fi
     AC_ARG_VAR([ALBERTA_DEBUG_CXXFLAGS],
-	[C++ cCompiler-flags used to create the debug-enabled libraries])
+	[C++ Compiler-flags used to create the debug-enabled libraries])
 fi
 
 #
@@ -598,10 +606,23 @@ if test "$ALBERTA_EFENCE" = 0 -a -n "$EFENCE_LIB"; then
     ALBERTA_EFENCE=1
 fi
 
+#
+# OpenMP
+#
+ALBERTA_OPENMP
+if test -n "${OPENMP_CFLAGS}"; then
+    ALBERTA_OPTIMIZE_CFLAGS="${ALBERTA_OPTIMIZE_CFLAGS} ${OPENMP_CFLAGS}"
+    ALBERTA_DEBUG_CFLAGS="${ALBERTA_DEBUG_CFLAGS} ${OPENMP_CFLAGS}"
+    ALBERTA_PROFILE_CFLAGS="${ALBERTA_PROFILE_CFLAGS} ${OPENMP_CFLAGS}"
+    ALBERTA_FFLAGS="${ALBERTA_FFLAGS} ${OPENMP_CFLAGS}"
+    LDFLAGS="${LDFLAGS} `echo ${OPENMP_CFLAGS}|sed -e 's/-/-XCClinker -/g'`"
+fi
+
 #
 # Install libtool.alberta for shared libraries?
 #
-ALBERTA_ENABLE_FLAG([install-libtool], [disable installation of libtool.alberta], 1)
+ALBERTA_ENABLE_FLAG([install-libtool],
+  [disable installation of libtool.alberta], 1)
 
 # building of all versions is enabled by default, but can be
 # disabled using --disable-DOW-dimension switches (the macros