diff --git a/auxdir/Makefile.am b/auxdir/Makefile.am
index 9daaa7383e12dedf8419d2aab0747529f3721f2e..068dfe175ee38d04939216705c39f03e530e7391 100644
--- a/auxdir/Makefile.am
+++ b/auxdir/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST = \
     x_ac_gpl_licensed.m4 \
     x_ac_munge.m4 \
     x_ac_ncurses.m4 \
+    x_ac_numa.m4 \
     x_ac_ptrace.m4 \
     x_ac_readline.m4 \
     x_ac_setproctitle.m4 \
diff --git a/auxdir/x_ac_numa.m4 b/auxdir/x_ac_numa.m4
new file mode 100644
index 0000000000000000000000000000000000000000..95523ceaed98e7a841b9c19f9e3211a3cc5e4295
--- /dev/null
+++ b/auxdir/x_ac_numa.m4
@@ -0,0 +1,25 @@
+##*****************************************************************************
+#  $Id$
+##*****************************************************************************
+#  AUTHOR:
+#    Morris Jette <jette1@llnl.gov>
+#
+#  SYNOPSIS:
+#    X_AC_NUMA
+#
+#  DESCRIPTION:
+#    Test for NUMA memory afffinity functions and set the definitions.
+#
+#  WARNINGS:
+#    This macro must be placed after AC_PROG_CC or equivalent.
+##*****************************************************************************
+
+AC_DEFUN([X_AC_NUMA], [
+
+# Test if numa_available function exists
+  save_LIBS="$LIBS"
+  LIBS="-lnuma $LIBS"
+  AC_CHECK_FUNCS(numa_available, [have_numa_available=yes], [LIBS="$save_LIBS"])
+  AM_CONDITIONAL(HAVE_NUMA_AFFINITY, test "x$have_numa_available" = "xyes")
+])
+
diff --git a/configure.ac b/configure.ac
index 52ce4eb3e7bfbf322c99126fb25ff6d5d11ef144..344735b2b29077c640c3136177aad035dc2e0ccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,10 @@ dnl Check of sched_getaffinity exists and it's argument count
 dnl
 X_AC_AFFINITY
 
+dnl Check if NUMA  memory afffinity functions exist
+dnl
+X_AC_NUMA
+
 dnl Checks for types.
 dnl
 X_AC_SLURM_BIGENDIAN