Compiler fixes.

diff --git a/clients/utilities.h b/clients/utilities.h
index d036bccc1aec107f58f1a651095aa8098dd0cf40..da973b5f883fbc89da1c7bed04328dd2b5131a5d 100644 (file)
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -49,10 +49,10 @@ extern "C" {
 char *strdup_cleanup(const char *str);
 void cleanup(void);
 long int timedif(struct timeval a, struct timeval b);
-void version_command(const char *command_name);
+void version_command(const char *command_name) __attribute__ ((noreturn));
 void help_command(const char *command_name, const char *description,
                   const struct option *long_options,
-                  memcached_programs_help_st *options);
+                  memcached_programs_help_st *options) __attribute__ ((noreturn));
 void process_hash_option(memcached_st *memc, char *opt_hash);
 bool initialize_sasl(memcached_st *memc, char *user, char *password);
 void shutdown_sasl(void);

diff --git a/configure.ac b/configure.ac
index eeaccd8244835fb81d6875178d3a6160d50a5168..83177bcab6877a08b8460b3f2d4fb71684789ef3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,8 +286,11 @@ fi
 AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
                        [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
 
+AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
+
 AX_HARDEN_COMPILER_FLAGS
-AX_PTHREAD
+
+AX_DEBUG
 
 AC_CONFIG_FILES([
   Makefile

diff --git a/m4/debug.m4 b/m4/debug.m4
new file mode 100644 (file)
index 0000000..6055765
--- /dev/null
+++ b/m4/debug.m4
@@ -0,0 +1,18 @@
+AC_DEFUN([AX_DEBUG],[
+  AC_ARG_WITH([debug],
+    [AS_HELP_STRING([--with-debug],
+       [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
+    [with_debug=$withval],
+    [with_debug=no])
+  AS_IF([test "$with_debug" = "yes"],[
+    # Debugging. No optimization.
+    AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
+    AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
+    AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
+  ],[
+    # Optimized version. No debug
+    AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
+    AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
+    AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])
+  ])
+])