X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=422a41d19f1b8709cf2a3028045a6ad08f725c9a;hb=fdfbb3939ecacfcc15d5c0a95a7d9cd99e146ea1;hp=8a462aa5d4a56bd2b3bede8ea62cb06d3219fbb3;hpb=ded836f0acf518b9011b7344658d45b9e46309ef;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 8a462aa5..422a41d1 100644
--- 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
 
@@ -144,15 +148,15 @@ LIBS="$save_LIBS"
 
 AC_SEARCH_LIBS(floorf, m)
 
+dnl Specialty checks
 DETECT_BYTEORDER
 ENABLE_UTILLIB
-
-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)
+ENABLE_DTRACE
+SETSOCKOPT_SANITY
+ENABLE_HSIEH_HASH
+REQUIRE_POD2MAN
+PROTOCOL_BINARY_TEST
+WITH_MEMCACHED
 
 dnl TODO: Remove this define once we are using 2.61 across the board.
 # AX_HEADER_ASSERT
@@ -197,16 +201,8 @@ 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"
-ac_cv_safe_to_use_Wconversion_=no
 
 if test "$GCC" = "yes"
 then
@@ -221,38 +217,10 @@ 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"
 
-  AC_CACHE_CHECK([whether it is safe to use -Wconversion],
-    [ac_cv_safe_to_use_Wconversion_],
-    [save_CFLAGS="$CFLAGS"
-     CFLAGS="-Werror -Wconversion"
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-         [[
-#include <netinet/in.h>
-void foo(in_port_t port)
-{
-  return;
-}
-         ]],[[
-in_port_t x= 0;
-foo(x);
-         ]])],
-       [ac_cv_safe_to_use_Wconversion_=yes],
-       [ac_cv_safe_to_use_Wconversion_=no])
-     CFLAGS="$save_CFLAGS"])
-  dnl disable -Wconversion for now. Will fix later
-  AS_IF([test "$ac_cv_safe_to_use_Wconversion_" = "yes"],
-        [
-          CC_WARNINGS="${CC_WARNINGS} -Wconversion"
-          CXX_WARNINGS="${CXX_WARNINGS} -Wconversion"
-        ])
 
   AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
     [ac_cv_safe_to_use_Wlogical_op_],
@@ -350,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 "---"
+