Better handling for LAPACK and MXM options

configure.ac

@@ -168,20 +168,36 @@ fi
 
 # TODO: Set defs for BLAS_MXM
 
-# MXM handling
-mxm_obj="mxm_std.o blas.o"
-if test "x$bgq" = "xyes";      then mxm_obj="mxm_std.o mxm_bgq.o"; fi # TODO: Set -O3 flag
-if test "x$xsmm" = "xyes";     then mxm_obj="mxm_std.o blas.o";    fi
-if test "x$nek_blas" = "xno";  then mxm_obj="mxm_std.o";           fi
-AC_SUBST([mxm_obj])
-
-# See if using Nek5000's LAPACK routines
-# If using automake: AM_CONDITIONAL([NO_LAPACK], [test "x$nek_lapack" = "xno"])
+# == MXM handling =============================================================
+# TODO: 
+#   * Set -O3 flag if $bgq = yes
+#   * Consistency check between options
+#   * If automake, AM_CONDITIONAL([BGQ], [test "x$bgq" = "xyes"]), etc.
+nek_mxm_obj="mxm_std.o blas.o"
+if test "x$bgq" = "xyes"; then 
+  AC_DEFINE([BGQ], 1, [if using IBM BG/Q optimizations])
+  nek_mxm_obj="mxm_std.o mxm_bgq.o"
+else
+  if test "x$xsmm" = "xyes"; then 
+    AC_DEFINE([XSMM], 1, [if using libxsmm for mxm])
+    nek_mxm_obj="mxm_std.o blas.o"
+  else
+    if test "x$nek_blas" = "xno"; then 
+      AC_DEFINE([BLAS_MXM], 1, [if not using Nek5000 BLAS mxm routines])
+      nek_mxm_obj="mxm_std.o"
+    fi
+  fi
+fi 
+AC_SUBST([nek_mxm_obj])
+
+# == LAPACK handling ==========================================================
+# TODO: 
+#   * if automake, AM_CONDITIONAL([NO_LAPACK], [test "x$nek_lapack" = "xno"])
+nek_lapack_obj="dsygv.o ssygv.o"
 if test "x$nek_lapack" = "xno"; then
   AC_DEFINE([NO_LAPACK], 1, [if not using Nek5000 LAPACK routines])
-  AC_SUBST([nek_lapack_obj], [""])
-else
-  AC_SUBST([nek_lapack_obj], ["dsygv.o ssygv.o"])
+  nek_lapack_obj=""
 fi
+AC_SUBST([nek_lapack_obj])
 
 AC_OUTPUT