Commit 215fd74d authored by Tom Barbette's avatar Tom Barbette

Force numa non inclusion when passing --without-numa

parent d4965c73
......@@ -153,7 +153,7 @@ class NetmapBufQ {
inline uint32_t extract() {
if (_count <= 0) {
if (_count == 0) {
expand(1024);
if (_count == 0) return 0;
}
......
......@@ -467,8 +467,8 @@ dnl
AC_DEFUN([CLICK_CHECK_NUMA], [
AC_ARG_WITH([numa],
[AS_HELP_STRING([--with-numa], [enable numa [no]])],
[use_numa=$withval], [use_numa=no])
[AS_HELP_STRING([--with-numa], [enable numa [yes]])],
[use_numa=$withval], [use_numa=yes])
if test "$use_numa" != "yes" -a "$use_numa" != "no"; then
if test "${NUMA_INCLUDES-NO}" != NO; then
......@@ -479,21 +479,23 @@ AC_DEFUN([CLICK_CHECK_NUMA], [
fi
HAVE_NUMA=no
if test "$use_numa" != "no"; then
AC_SEARCH_LIBS([numa_available], [numa], [ac_have_libnuma=yes], [ac_have_libnuma=no])
if test "$ac_have_libnuma" = yes; then
AC_DEFINE([HAVE_NUMA], [1], [Define if you have the <nuda.h> header file.])
LDFLAGS="$LDFLAGS -Lnuma"
fi
AC_SEARCH_LIBS([numa_available], [numa], [ac_have_libnuma=yes], [ac_have_libnuma=no])
if test "$ac_have_libnuma" = yes; then
AC_DEFINE([HAVE_NUMA], [1], [Define if you have the <nuda.h> header file.])
LDFLAGS="$LDFLAGS -Lnuma"
fi
if test "$HAVE_NUMA" = yes; then
AC_CACHE_CHECK([whether numa.h works],
[ac_cv_working_numa_h], [
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <numa.h>]])],
[ac_cv_working_numa_h=yes],
[ac_cv_working_numa_h=no])])
test "$ac_cv_working_numa_h" != yes && HAVE_NUMA=
if test "$HAVE_NUMA" = yes; then
AC_CACHE_CHECK([whether numa.h works],
[ac_cv_working_numa_h], [
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <numa.h>]])],
[ac_cv_working_numa_h=yes],
[ac_cv_working_numa_h=no])])
test "$ac_cv_working_numa_h" != yes && HAVE_NUMA=
fi
fi
AC_SUBST(NUMA_INCLUDES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment