From fd6e74b5cec5a9a99c54a92316b0630bf5cbf8ec Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 14 Jun 2009 16:47:48 -0700 Subject: [PATCH] Made ENABLE_HSIEH_HASH into a macro. --- configure.ac | 2 +- m4/hsieh.m4 | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 8f67691d..467fe718 100644 --- a/configure.ac +++ b/configure.ac @@ -152,11 +152,11 @@ DETECT_BYTEORDER ENABLE_UTILLIB ENABLE_DTRACE SETSOCKOPT_SANITY +ENABLE_HSIEH_HASH sinclude(m4/pod2man.m4) sinclude(m4/protocol_binary.m4) sinclude(m4/memcached.m4) -sinclude(m4/hsieh.m4) dnl TODO: Remove this define once we are using 2.61 across the board. # AX_HEADER_ASSERT diff --git a/m4/hsieh.m4 b/m4/hsieh.m4 index f958f469..b057bfdc 100644 --- a/m4/hsieh.m4 +++ b/m4/hsieh.m4 @@ -1,22 +1,18 @@ dnl --------------------------------------------------------------------------- -dnl Macro: HSIEH_HASH +dnl Macro: ENABLE_HSIEH_HASH dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(hsieh_hash, - [ --enable-hsieh_hash build with support for hsieh hashing.], - [ - if test "x$enableval" != "xno"; then - ENABLE_HSIEH="true" - AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support]) - else - ENABLE_HSIEH="false" - fi - ], - [ - ENABLE_HSIEH="false" - ] -) +AC_DEFUN([ENABLE_HSIEH_HASH], + [AC_ARG_ENABLE([hsieh_hash], + [AS_HELP_STRING([--enable-hsieh_hash], + [build with support for hsieh hashing. @<:default=off@:>@])], + [ac_cv_enable_hsieh_hash=yes], + [ac_cv_enable_hsieh_hash=no]) -AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "x$ENABLE_HSIEH" = "xtrue"]) + AS_IF([test "$ac_cv_enable_hsieh_hash" = "yes"], + [AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support])]) + + AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "$ac_cv_enable_hsieh_hash" = "yes"]) +]) dnl --------------------------------------------------------------------------- -dnl End Macro: HSIEH_HASH +dnl End Macro: ENABLE_HSIEH_HASH dnl --------------------------------------------------------------------------- -- 2.30.2