Made ENABLE_HSIEH_HASH into a macro.

[m6w6/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9bb23a28e4e412e5996af32b88f417bd979742d9..467fe718eda6906c591e5f5316393b7d29f93c31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,18 +97,22 @@ fi
 AC_SUBST(LD_VERSION_SCRIPT)
 AC_SUBST(LD_UTIL_VERSION_SCRIPT)
 
+# Use the C99 enabling flag found earlier
+AS_IF([test "$ac_cv_prog_cc_c99" != "no"],
+      [CFLAGS="$ac_cv_prog_cc_c99 ${CFLAGS}"])
+
 # Build optimized or debug version ?
 # First check for gcc and g++
 if test "$GCC" = "yes"
 then
-  CFLAGS="-ggdb3 -std=gnu99 ${CFLAGS}"
+  CFLAGS="-ggdb3 ${CFLAGS}"
   DEBUG_CFLAGS="-O0"
   OPTIMIZE_CFLAGS="-O3"
 fi
 if test "x$SUNCC" = "xyes"
 then
-   CFLAGS="-g -mt -xc99=all $CFLAGS"
-   CXXFLAGS="-g -mt -xlang=c99 $CXXFLAGS"
+   CFLAGS="-g -mt ${CFLAGS}"
+   CXXFLAGS="-g -mt -xlang=c99 ${CXXFLAGS}"
    OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -xstrconst"
 fi
 
@@ -146,13 +150,13 @@ AC_SEARCH_LIBS(floorf, m)
 
 DETECT_BYTEORDER
 ENABLE_UTILLIB
+ENABLE_DTRACE
+SETSOCKOPT_SANITY
+ENABLE_HSIEH_HASH
 
 sinclude(m4/pod2man.m4)
-sinclude(m4/dtrace.m4)
 sinclude(m4/protocol_binary.m4)
 sinclude(m4/memcached.m4)
-sinclude(m4/setsockopt.m4)
-sinclude(m4/hsieh.m4)
 
 dnl TODO: Remove this define once we are using 2.61 across the board.
 # AX_HEADER_ASSERT
@@ -197,14 +201,7 @@ AC_ARG_ENABLE([coverage],
     [ac_coverage="$enableval"],
     [ac_coverage="no"])
 
-AC_ARG_ENABLE([unreachable],
-  [AS_HELP_STRING([--enable-unreachable],
-    [Enable warnings about unreachable code @<:@default=no@:>@])],
-  [ac_warn_unreachable="$enableval"],
-  [ac_warn_unreachable="no"])
-
-
-dnl We can't do these two warnings, so turn them off
+dnl We can't do this warning, so turn off
 W_STRICT_ALIASING="-Wno-strict-aliasing"
 
 if test "$GCC" = "yes"
@@ -220,9 +217,6 @@ then
   AS_IF([test "$building_from_bzr" = "yes"],
         [W_FAIL="-Werror"])
 
-  AS_IF([test "$ac_warn_unreachable" = "yes"],
-        [W_UNREACHABLE="-Wunreachable-code"])
-
   BASE_WARNINGS="-pedantic -W -Wall -Wextra ${W_FAIL} -Wundef  -Wshadow -Wmissing-declarations ${W_STRICT_ALIASING}" 
   CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wswitch-default -Wswitch-enum -Wcast-align"
   CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual  -Wnon-virtual-dtor -Wctor-dtor-privacy  -Wold-style-cast -Weffc++ -Wno-long-long"
@@ -324,3 +318,17 @@ AC_CONFIG_FILES([
   support/libmemcached-fc.spec
   ])
 AC_OUTPUT
+
+echo "---"
+echo "Configuration summary for $PACKAGE_NAME version $VERSION"
+echo ""
+echo "   * Installation prefix:       $prefix"
+echo "   * System type:               $host_vendor-$host_os"
+echo "   * Host CPU:                  $host_cpu"
+echo "   * C Compiler:                $CC_VERSION"
+echo "   * Assertions enabled:        $ac_cv_assert"
+echo "   * Debug enabled:             $with_debug"
+echo "   * Warnings as failure:       $building_from_bzr"
+echo ""
+echo "---"
+