Merge lp:~brianaker/libmemcached/update-1.2 into lp:libmemcached

[Brian Aker]

[lp:~brianaker/libmemcached/update-1.2]

1106. By Brian Aker on 2013-06-12

Fix compile issues and version number (which has to be a number).

1107. By Brian Aker on 2013-06-12

Fix issue with sasl symbol

1108. By Brian Aker on 2013-06-12

Missing sasl symbol.

1109. By Brian Aker on 2013-06-13

Update bootstrap

1110. By Brian Aker on 2013-06-14

Update to just "dist" and not "check" since we do that elsewhere.

1111. By Brian Aker on 2013-06-14

Add feature.h to spec file.

=== modified file 'bootstrap.sh'
--- bootstrap.sh	2013-05-03 07:52:47 +0000
+++ bootstrap.sh	2013-06-14 07:11:24 +0000
@@ -43,6 +43,19 @@
 #   WARNINGS
 #
 
+use_banner ()
+{
+  echo "#####################################################################################"
+  echo "#"
+  echo "#"
+  echo "#"
+  echo "#    TARGET:$1"
+  echo "#"
+  echo "#"
+  echo "#"
+  echo "#####################################################################################"
+}
+
 command_not_found_handle ()
 {
   warn "$@: command not found"
@@ -60,27 +73,27 @@
   return 127
 }
 
-function error ()
+error ()
 { 
   echo "$BASH_SOURCE:$BASH_LINENO: $@" >&2
 }
 
-function die ()
+die ()
 { 
   echo "$BASH_SOURCE:$BASH_LINENO: $@" >&2
   exit 1; 
 }
 
-function warn ()
+warn ()
 { 
   echo "$BASH_SOURCE:$BASH_LINENO: $@"
   #echo "$BASH_SOURCE:$BASH_LINENO: $@" >&1
 }
 
-function nassert ()
+nassert ()
 {
   local param_name=\$"$1"
-  local param_value=`eval "expr \"$param_name\" "`
+  local param_value="$(eval "expr \"$param_name\" ")"
 
   if [ -n "$param_value" ]; then
     echo "$bash_source:$bash_lineno: assert($param_name) had value of "$param_value"" >&2
@@ -88,10 +101,10 @@
   fi
 }
 
-function assert ()
+assert ()
 {
   local param_name=\$"$1"
-  local param_value=`eval "expr \"$param_name\" "`
+  local param_value="$(eval "expr \"$param_name\" ")"
 
   if [ -z "$param_value" ]; then
     echo "$bash_source:$bash_lineno: assert($param_name)" >&2
@@ -99,7 +112,7 @@
   fi
 }
 
-function assert_file ()
+assert_file ()
 {
   if [ ! -f "$1" ]; then
     echo "$BASH_SOURCE:$BASH_LINENO: assert($1) does not exist: $2" >&2
@@ -107,7 +120,7 @@
   fi
 }
 
-function assert_no_file ()
+assert_no_file ()
 {
   if [ -f "$1" ]; then
     echo "$BASH_SOURCE:$BASH_LINENO: assert($1) file exists: $2" >&2
@@ -115,7 +128,7 @@
   fi
 }
 
-function assert_no_directory ()
+assert_no_directory ()
 {
   if [ -d "$1" ]; then
     echo "$BASH_SOURCE:$BASH_LINENO: assert($1) directory exists: $2" >&2
@@ -123,7 +136,7 @@
   fi
 }
 
-function assert_exec_file ()
+assert_exec_file ()
 {
   if [ ! -f "$1" ]; then
     echo "$BASH_SOURCE:$BASH_LINENO: assert($1) does not exist: $2" >&2
@@ -136,16 +149,16 @@
   fi
 }
 
-function command_exists ()
+command_exists ()
 {
   type "$1" &> /dev/null ;
 }
 
-function rebuild_host_os ()
+rebuild_host_os ()
 {
   HOST_OS="${UNAME_MACHINE_ARCH}-${VENDOR}-${VENDOR_DISTRIBUTION}-${VENDOR_RELEASE}-${UNAME_KERNEL}-${UNAME_KERNEL_RELEASE}"
   if [ -z "$1" ]; then
-    if $VERBOSE; then
+    if $verbose; then
       echo "HOST_OS=$HOST_OS"
     fi
   fi
@@ -153,9 +166,9 @@
 
 # Validate the distribution name, or toss an erro
 #  values: darwin,fedora,rhel,ubuntu,debian,opensuse
-function set_VENDOR_DISTRIBUTION ()
+set_VENDOR_DISTRIBUTION ()
 {
-  local dist=`echo "$1" | tr '[A-Z]' '[a-z]'`
+  local dist="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
   case "$dist" in
     darwin)
       VENDOR_DISTRIBUTION='darwin'
@@ -185,11 +198,11 @@
 }
 
 # Validate a Vendor's release name/number 
-function set_VENDOR_RELEASE ()
+set_VENDOR_RELEASE ()
 {
-  local release=`echo "$1" | tr '[A-Z]' '[a-z]'`
+  local release="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
 
-  if $DEBUG; then 
+  if $verbose; then 
     echo "VENDOR_DISTRIBUTION:$VENDOR_DISTRIBUTION"
     echo "VENDOR_RELEASE:$release"
   fi
@@ -252,9 +265,9 @@
 
 
 #  Valid values are: apple, redhat, centos, canonical, oracle, suse
-function set_VENDOR ()
+set_VENDOR ()
 {
-  local vendor=`echo "$1" | tr '[A-Z]' '[a-z]'`
+  local vendor="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
 
   case $vendor in
     apple)
@@ -295,8 +308,8 @@
       ;;
   esac
 
-  set_VENDOR_DISTRIBUTION $2
-  set_VENDOR_RELEASE $3
+  set_VENDOR_DISTRIBUTION "$2"
+  set_VENDOR_RELEASE "$3"
 
   # Set which vendor/versions we trust for autoreconf
   case $VENDOR_DISTRIBUTION in
@@ -320,37 +333,37 @@
 
 }
 
-function determine_target_platform ()
+determine_target_platform ()
 {
-  UNAME_MACHINE_ARCH=`(uname -m) 2>/dev/null` || UNAME_MACHINE_ARCH=unknown
-  UNAME_KERNEL=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-  UNAME_KERNEL_RELEASE=`(uname -r) 2>/dev/null` || UNAME_KERNEL_RELEASE=unknown
+  UNAME_MACHINE_ARCH="$(uname -m 2>/dev/null)" || UNAME_MACHINE_ARCH=unknown
+  UNAME_KERNEL="$(uname -s 2>/dev/null)"  || UNAME_SYSTEM=unknown
+  UNAME_KERNEL_RELEASE="$(uname -r 2>/dev/null)" || UNAME_KERNEL_RELEASE=unknown
 
   if [[ -x '/usr/bin/sw_vers' ]]; then 
-    local _VERSION=`/usr/bin/sw_vers -productVersion`
+    local _VERSION="$(/usr/bin/sw_vers -productVersion)"
     set_VENDOR 'apple' 'darwin' $_VERSION
   elif [[ $(uname) == 'Darwin' ]]; then
     set_VENDOR 'apple' 'darwin' 'mountain'
   elif [[ -f '/etc/fedora-release' ]]; then 
-    local fedora_version=`cat /etc/fedora-release | awk ' { print $3 } '`
+    local fedora_version="$(awk ' { print $3 } ' < /etc/fedora-release)"
     set_VENDOR 'redhat' 'fedora' $fedora_version
   elif [[ -f '/etc/centos-release' ]]; then
-    local centos_version=`cat /etc/centos-release | awk ' { print $7 } '`
+    local centos_version="$(awk ' { print $7 } ' < /etc/centos-release)"
     set_VENDOR 'centos' 'rhel' $centos_version
   elif [[ -f '/etc/SuSE-release' ]]; then
-    local suse_distribution=`head -1 /etc/SuSE-release | awk ' { print $1 } '`
-    local suse_version=`head -1 /etc/SuSE-release | awk ' { print $2 } '`
+    local suse_distribution="$(head -1 /etc/SuSE-release | awk ' { print $1 } ')"
+    local suse_version="$(head -1 /etc/SuSE-release | awk ' { print $2 } ')"
     set_VENDOR 'suse' $suse_distribution $suse_version
   elif [[ -f '/etc/redhat-release' ]]; then
-    local rhel_version=`cat /etc/redhat-release | awk ' { print $7 } '`
-    local _vendor=`rpm -qf /etc/redhat-release`
+    local rhel_version="$(awk ' { print $7 } ' < /etc/redhat-release)"
+    local _vendor="$(rpm -qf /etc/redhat-release)"
     set_VENDOR $_vendor 'rhel' $rhel_version
   elif [[ -f '/etc/os-release' ]]; then 
     source '/etc/os-release'
     set_VENDOR $ID $ID $VERSION_ID
   elif [[ -x '/usr/bin/lsb_release' ]]; then 
-    local _ID=`/usr/bin/lsb_release -s -i`
-    local _VERSION=`/usr/bin/lsb_release -s -r`
+    local _ID="$(/usr/bin/lsb_release -s -i)"
+    local _VERSION="$(/usr/bin/lsb_release -s -r)"
     set_VENDOR $_ID $_ID $_VERSION_ID
   elif [[ -f '/etc/lsb-release' ]]; then 
     source '/etc/lsb-release'
@@ -360,13 +373,13 @@
   rebuild_host_os
 }
 
-function run_configure ()
+run_configure ()
 {
   # We will run autoreconf if we are required
   run_autoreconf_if_required
 
   # We always begin at the root of our build
-  if [ ! popd ]; then
+  if [ ! $? ]; then
     die "Programmer error, we entered run_configure with a stacked directory"
   fi
 
@@ -378,47 +391,46 @@
   if [[ -n "$BUILD_DIR" ]]; then
     rm -r -f $BUILD_DIR
     mkdir -p $BUILD_DIR
-    safe_pushd $BUILD_DIR
   fi
 
   # Arguments for configure
-  local BUILD_CONFIGURE_ARG= 
+  local BUILD_CONFIGURE_ARG='' 
 
-  # If ENV DEBUG is set we enable both debug and asssert, otherwise we see if this is a VCS checkout and if so enable assert
+  # If debug is set we enable both debug and asssert, otherwise we see if this is a VCS checkout and if so enable assert
   # Set ENV ASSERT in order to enable assert.
   # If we are doing a valgrind run, we always compile with assert disabled
   if $valgrind_run; then
-    BUILD_CONFIGURE_ARG+= '--enable-assert=no'
+    BUILD_CONFIGURE_ARG="--enable-assert=no $BUILD_CONFIGURE_ARG"
   else
-    if $DEBUG; then 
-      BUILD_CONFIGURE_ARG+=' --enable-debug --enable-assert'
+    if $debug; then 
+      BUILD_CONFIGURE_ARG="--enable-debug --enable-assert $BUILD_CONFIGURE_ARG"
     elif [[ -n "$VCS_CHECKOUT" ]]; then
-      BUILD_CONFIGURE_ARG+=' --enable-assert'
+      BUILD_CONFIGURE_ARG="--enable-assert $BUILD_CONFIGURE_ARG"
     fi
   fi
 
   if [[ -n "$CONFIGURE_ARG" ]]; then 
-    BUILD_CONFIGURE_ARG+=" $CONFIGURE_ARG"
+    BUILD_CONFIGURE_ARG="$CONFIGURE_ARG $BUILD_CONFIGURE_ARG"
   fi
 
   if [[ -n "$PREFIX_ARG" ]]; then 
-    BUILD_CONFIGURE_ARG+=" $PREFIX_ARG"
+    BUILD_CONFIGURE_ARG="$PREFIX_ARG $BUILD_CONFIGURE_ARG"
   fi
 
   ret=1;
   # If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV
   case $HOST_OS in
     *-darwin-*)
-      CC=clang CXX=clang++ $top_srcdir/configure $BUILD_CONFIGURE_ARG || die "Cannot execute CC=clang CXX=clang++ configure $BUILD_CONFIGURE_ARG"
+      run CC=clang CXX=clang++ $top_srcdir/configure "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=clang CXX=clang++ configure $BUILD_CONFIGURE_ARG"
       ret=$?
       ;;
     rhel-5*)
       command_exists 'gcc44' || die "Could not locate gcc44"
-      CC=gcc44 CXX=gcc44 $top_srcdir/configure $BUILD_CONFIGURE_ARG || die "Cannot execute CC=gcc44 CXX=gcc44 configure $BUILD_CONFIGURE_ARG"
+      run CC=gcc44 CXX=gcc44 $top_srcdir/configure "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=gcc44 CXX=gcc44 configure $BUILD_CONFIGURE_ARG"
       ret=$?
       ;;
     *)
-      $CONFIGURE $BUILD_CONFIGURE_ARG
+      run $CONFIGURE "$BUILD_CONFIGURE_ARG"
       ret=$?
       ;;
   esac
@@ -432,25 +444,27 @@
   fi
 }
 
-function setup_gdb_command () {
+setup_gdb_command ()
+{
   GDB_TMPFILE=$(mktemp /tmp/gdb.XXXXXXXXXX)
-  echo 'set logging overwrite on' > $GDB_TMPFILE
-  echo 'set logging on' >> $GDB_TMPFILE
-  echo 'set environment LIBTEST_IN_GDB=1' >> $GDB_TMPFILE
-  echo 'run' >> $GDB_TMPFILE
-  echo 'thread apply all bt' >> $GDB_TMPFILE
-  echo 'quit' >> $GDB_TMPFILE
+  echo 'set logging overwrite on' > "$GDB_TMPFILE"
+  echo 'set logging on' >> "$GDB_TMPFILE"
+  echo 'set environment LIBTEST_IN_GDB=1' >> "$GDB_TMPFILE"
+  echo 'run' >> "$GDB_TMPFILE"
+  echo 'thread apply all bt' >> "$GDB_TMPFILE"
+  echo 'quit' >> "$GDB_TMPFILE"
   GDB_COMMAND="gdb -f -batch -x $GDB_TMPFILE"
 }
 
-function setup_valgrind_command () {
-  VALGRIND_PROGRAM=`type -p valgrind`
+setup_valgrind_command ()
+{
+  VALGRIND_PROGRAM="$(type -p valgrind)"
   if [[ -n "$VALGRIND_PROGRAM" ]]; then
     VALGRIND_COMMAND="$VALGRIND_PROGRAM --error-exitcode=1 --leak-check=yes --malloc-fill=A5 --free-fill=DE --xml=yes --xml-file=\"valgrind-%p.xml\""
   fi
 }
 
-function save_BUILD ()
+save_BUILD ()
 {
   if [[ -n "$OLD_CONFIGURE" ]]; then
     die "OLD_CONFIGURE($OLD_CONFIGURE) was set on push, programmer error!"
@@ -489,7 +503,7 @@
   fi
 }
 
-function restore_BUILD ()
+restore_BUILD ()
 {
   if [[ -n "$OLD_CONFIGURE" ]]; then
     CONFIGURE=$OLD_CONFIGURE
@@ -520,31 +534,7 @@
   export -n CC CXX
 }
 
-function safe_pushd ()
-{
-  pushd $1 &> /dev/null ;
-
-  if [ -n "$BUILD_DIR" ]; then
-    if $VERBOSE; then
-      echo "BUILD_DIR=$BUILD_DIR"
-    fi
-  fi
-}
-
-function safe_popd ()
-{
-  local directory_to_delete=`pwd`
-  popd &> /dev/null ;
-  if [ $? -eq 0 ]; then
-    if [[ "$top_srcdir" == "$directory_to_delete" ]]; then
-      die "We almost deleted top_srcdir($top_srcdir), programmer error"
-    fi
-
-    rm -r -f "$directory_to_delete"
-  fi
-}
-
-function make_valgrind ()
+make_valgrind ()
 {
   # If the env VALGRIND_COMMAND is set then we assume it is valid
   local valgrind_was_set=false
@@ -582,11 +572,6 @@
   make_target 'check'
   ret=$?
 
-  # If we aren't going to error, we will clean up our environment
-  if [ "$ret" -eq 0 ]; then
-     make 'distclean'
-  fi
-
   valgrind_run=false
 
   restore_BUILD
@@ -596,9 +581,9 @@
   fi
 }
 
-function make_install_system ()
+make_install_system ()
 {
-  local INSTALL_LOCATION=$(mktemp -d /tmp/XXXXXXXXXX)
+  local INSTALL_LOCATION="$(mktemp -d /tmp/XXXXXXXXXX)"
 
   save_BUILD
   PREFIX_ARG="--prefix=$INSTALL_LOCATION"
@@ -623,10 +608,9 @@
   fi
 
   restore_BUILD
-  safe_popd
 }
 
-function make_darwin_malloc ()
+make_darwin_malloc ()
 {
   run_configure_if_required
 
@@ -645,7 +629,7 @@
 }
 
 # This will reset our environment, and make sure built files are available.
-function make_for_snapshot ()
+make_for_snapshot ()
 {
   # Lets make sure we have a clean environment
   assert_no_file 'Makefile'
@@ -661,7 +645,7 @@
   assert_exec_file 'configure'
 }
 
-function check_mingw ()
+check_mingw ()
 {
   command_exists 'mingw64-configure'
   ret=$?
@@ -678,7 +662,7 @@
   return 0
 }
 
-function check_clang ()
+check_clang ()
 {
   command_exists 'clang'
   ret=$?
@@ -689,7 +673,7 @@
   return 0
 }
 
-function check_clang_analyzer ()
+check_clang_analyzer ()
 {
   command_exists 'scan-build'
   ret=$?
@@ -700,7 +684,7 @@
   return 0
 }
 
-function make_skeleton ()
+make_skeleton ()
 {
   run_configure
   ret=$?
@@ -733,7 +717,7 @@
   return $ret
 }
 
-function make_for_mingw ()
+make_for_mingw ()
 {
   if ! check_mingw; then
     return 1
@@ -760,7 +744,7 @@
   return $ret
 }
 
-function make_for_clang ()
+make_for_clang ()
 {
   if ! check_clang; then
     return 1
@@ -788,7 +772,7 @@
   return $ret
 }
 
-function make_for_clang_analyzer ()
+make_for_clang_analyzer ()
 {
   if ! check_clang; then
     return 1
@@ -824,7 +808,7 @@
 }
 
 # If we are locally testing, we should make sure the environment is setup correctly
-function check_for_jenkins ()
+check_for_jenkins ()
 {
   if ! $jenkins_build_environment; then
     echo "Not inside of jenkins, simulating environment"
@@ -839,31 +823,50 @@
   fi
 }
 
-function make_universe ()
+make_universe ()
 {
+  use_banner 'make maintainer-clean'
+  make_maintainer_clean
+
+  use_banner 'snapshot'
   make_for_snapshot
+
+  use_banner 'valgrind'
   make_valgrind
+
+  use_banner 'gdb'
   make_gdb
+
+  use_banner 'rpm'
   make_rpm
+
+  use_banner 'clang'
   make_for_clang
+
+  use_banner 'clang analyzer'
   make_for_clang_analyzer
 
-  if [ check_mingw -eq 0 ]; then
+  use_banner 'mingw'
+  check_mingw
+  if [ $? -eq 0 ]; then
     make_for_mingw
   fi
 
+  use_banner 'make distcheck'
   make_distcheck
+
+  use_banner 'make install'
   make_install_system
 }
 
-function check_snapshot ()
+check_snapshot ()
 {
   if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
     assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
   fi
 }
 
-function make_for_continuus_integration ()
+make_for_continuus_integration ()
 {
   # Setup the environment if we are local
   check_for_jenkins
@@ -895,23 +898,21 @@
   esac
 
   make_maintainer_clean
-
-  safe_popd
 }
 
 # The point to this test is to test bootstrap.sh itself
-function self_test ()
+self_test ()
 {
   # We start off with a clean env
   make_maintainer_clean
 
-  eval "./bootstrap.sh jenkins" || die "failed 'jenkins'"
-  eval "./bootstrap.sh all" || die "failed 'all'"
-  eval "./bootstrap.sh gdb" || die "failed 'gdb'"
-  eval "./bootstrap.sh maintainer-clean" || die "failed 'maintainer-clean'"
+#  eval "./bootstrap.sh jenkins" || die "failed 'jenkins'"
+#  eval "./bootstrap.sh all" || die "failed 'all'"
+#  eval "./bootstrap.sh gdb" || die "failed 'gdb'"
+#  eval "./bootstrap.sh maintainer-clean" || die "failed 'maintainer-clean'"
 }
 
-function make_install_html ()
+make_install_html ()
 {
   run_configure_if_required
   assert_file 'configure'
@@ -919,7 +920,7 @@
   make_target 'install-html'
 }
 
-function make_gdb ()
+make_gdb ()
 {
   save_BUILD
 
@@ -962,7 +963,7 @@
 
 # $1 target to compile
 # $2 to die, or not to die, based on contents
-function make_target ()
+make_target ()
 {
   if [ -z "$1" ]; then
     die "Programmer error, no target provided for make"
@@ -974,7 +975,7 @@
   fi
 
   if [ -n "$TESTS_ENVIRONMENT" ]; then
-    if $VERBOSE; then
+    if $verbose; then
       echo "TESTS_ENVIRONMENT=$TESTS_ENVIRONMENT"
     fi
   fi
@@ -984,12 +985,14 @@
   fi
 
   # $2 represents error or warn
-  run $MAKE $1
+  run "$MAKE" "$1"
   ret=$?
 
   if [ $ret -ne 0 ]; then
     if [ -n "$2" ]; then
       warn "Failed to execute $MAKE $1: $ret"
+    elif [ $ret -eq 2 ]; then
+      die "Failed to execute $MAKE $1"
     else
       die "Failed to execute $MAKE $1: $ret"
     fi
@@ -998,12 +1001,12 @@
   return $ret
 }
 
-function make_distcheck ()
+make_distcheck ()
 {
   make_target 'distcheck'
 }
 
-function make_rpm ()
+make_rpm ()
 {
   if command_exists 'rpmbuild'; then
     if [ -f 'rpm.am' -o -d 'rpm' ]; then
@@ -1018,7 +1021,7 @@
   fi
 }
 
-function make_maintainer_clean ()
+make_maintainer_clean ()
 {
   run_configure_if_required
   make_target 'maintainer-clean' 'no_error'
@@ -1029,24 +1032,34 @@
   assert_no_directory 'autom4te.cache'
 }
 
-function make_check ()
+make_distclean ()
+{
+  run_configure_if_required
+  make_target 'distclean' 'no_error'
+
+  # Lets make sure we really cleaned up the environment
+  assert_no_file 'Makefile'
+  assert_file 'configure'
+}
+
+make_check ()
 {
   make_target 'check'
 }
 
-function make_jenkins_default ()
+make_jenkins_default ()
 {
   run_configure
   make_target 'all'
 }
 
-function make_default ()
+make_default ()
 {
   run_configure_if_required
   make_target 'all'
 }
 
-function run_configure_if_required () 
+run_configure_if_required () 
 {
   run_autoreconf_if_required
 
@@ -1057,14 +1070,14 @@
   assert_file 'Makefile' 'configure did not produce a Makefile'
 }
 
-function run_make_maintainer_clean_if_possible () 
+run_make_maintainer_clean_if_possible () 
 {
   if [ -f 'Makefile' ]; then
     make_maintainer_clean
   fi
 }
 
-function run_autoreconf_if_required () 
+run_autoreconf_if_required () 
 {
   if [ ! -x 'configure' ]; then
     run_autoreconf
@@ -1074,25 +1087,25 @@
   bash -n configure
 }
 
-function run_autoreconf () 
+run_autoreconf () 
 {
   if [[ -z "$AUTORECONF" ]]; then
     die "Programmer error, tried to call run_autoreconf () but AUTORECONF was not set"
   fi
 
-  if test $use_libtool = 1; then
+  if $use_libtool; then
     assert $BOOTSTRAP_LIBTOOLIZE
-    run $BOOTSTRAP_LIBTOOLIZE '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
+    run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
   fi
 
-  run $AUTORECONF $AUTORECONF_ARGS || die "Cannot execute $AUTORECONF"
+  run "$AUTORECONF" "$AUTORECONF_ARGS" || die "Cannot execute $AUTORECONF"
 
   eval 'bash -n configure' || die "autoreconf generated a malformed configure"
 }
 
-function run ()
+run ()
 {
-  if $VERBOSE; then
+  if $verbose; then
     echo "\`$@' $ARGS"
   fi
 
@@ -1100,39 +1113,41 @@
     return 127;
   fi
 
-  eval $@ $ARGS
+  eval "$@" "$ARGS"
 } 
 
-function parse_command_line_options ()
+parse_command_line_options ()
 {
   local SHORTOPTS=':apcmt:dvh'
 
-  nassert MAKE_TARGET
+  nassert OPT_TARGET
 
   while getopts "$SHORTOPTS" opt; do
     case $opt in
       a) #--autoreconf
         AUTORECONF_OPTION=true
-        MAKE_TARGET='autoreconf'
+        OPT_TARGET+='autoreconf'
         ;;
       p) #--print-env
-        PRINT_SETUP_OPTION=true
+        print_setup_opt=true
         ;;
       c) # --configure
         CONFIGURE_OPTION=true
-        MAKE_TARGET='configure'
+        OPT_TARGET+='configure'
         ;;
       m) # maintainer-clean
         CLEAN_OPTION=true
-        MAKE_TARGET='clean_op'
+        ;;
+      o) # target
+        CONFIGURE_ARG="$OPTARG"
         ;;
       t) # target
         TARGET_OPTION=true
         TARGET_OPTION_ARG="$OPTARG"
-        MAKE_TARGET="$OPTARG"
+        OPT_TARGET+="$OPTARG"
         ;;
       d) # debug
-        DEBUG_OPTION=true
+        opt_debug=true
         enable_debug
         ;;
       h) # help
@@ -1141,6 +1156,7 @@
         echo "  -p # Print ENV";
         echo "  -c # Just run configure";
         echo "  -m # Just run maintainer-clean";
+        echo "  -o # Specify configure arguments";
         echo "  -t # Make target";
         echo "  -d # Enable debug";
         echo "  -h # Show help";
@@ -1148,8 +1164,8 @@
         exit
         ;;
       v) # verbose
-        VERBOSE_OPTION=true
-        VERBOSE=true
+        opt_verbose=true
+        verbose=true
         ;;
       :)
         echo "Option -$OPTARG requires an argument." >&2
@@ -1165,11 +1181,11 @@
   shift $((OPTIND-1))
 
   if [ -n "$1" ]; then
-    MAKE_TARGET="$@"
+    OPT_TARGET="$@"
   fi
 }
 
-function determine_vcs ()
+determine_vcs ()
 {
   if [[ -d '.git' ]]; then
     VCS_CHECKOUT=git
@@ -1184,38 +1200,37 @@
   fi
 
   if [[ -n "$VCS_CHECKOUT" ]]; then
-    VERBOSE=true
+    verbose=true
   fi
 }
 
-function require_libtoolise ()
+require_libtoolise ()
 {
-  use_libtool=0
   grep '^[         ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
-    && use_libtool=1
+    && use_libtool=true
   grep '^[         ]*LT_INIT' configure.ac >/dev/null \
-    && use_libtool=1
+    && use_libtool=true
 }
 
-function autoreconf_setup ()
+autoreconf_setup ()
 {
   # Set ENV MAKE in order to override "make"
   if [[ -z "$MAKE" ]]; then 
     if command_exists 'gmake'; then
-      MAKE=`type -p gmake`
+      MAKE="$(type -p gmake)"
     else
       if command_exists 'make'; then
-        MAKE=`type -p make`
+        MAKE="$(type -p make)"
       fi
     fi
     
     if [ "$VCS_CHECKOUT" ]; then
-      if $DEBUG; then
+      if $debug; then
         MAKE="$MAKE --warn-undefined-variables"
       fi
     fi
 
-    if $DEBUG; then
+    if $debug; then
       MAKE="$MAKE -d"
     fi
   fi
@@ -1224,7 +1239,7 @@
     GNU_BUILD_FLAGS="--install --force"
   fi
 
-  if $VERBOSE; then
+  if $verbose; then
     GNU_BUILD_FLAGS="$GNU_BUILD_FLAGS --verbose"
   fi
 
@@ -1240,9 +1255,9 @@
     fi
   fi
 
-  if test $use_libtool = 1; then
+  if $use_libtool; then
     if [[ -n "$LIBTOOLIZE" ]]; then
-      BOOTSTRAP_LIBTOOLIZE=`type -p $LIBTOOLIZE`
+      BOOTSTRAP_LIBTOOLIZE="$(type -p $LIBTOOLIZE)"
 
       if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
         echo "Couldn't find user supplied libtoolize, it is required"
@@ -1251,14 +1266,14 @@
     else
       # If we are using OSX, we first check to see glibtoolize is available
       if [[ "$VENDOR_DISTRIBUTION" == "darwin" ]]; then
-        BOOTSTRAP_LIBTOOLIZE=`type -p glibtoolize`
+        BOOTSTRAP_LIBTOOLIZE="$(type -p glibtoolize)"
 
         if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
           echo "Couldn't find glibtoolize, it is required on OSX"
           return 1
         fi
       else
-        BOOTSTRAP_LIBTOOLIZE=`type -p libtoolize`
+        BOOTSTRAP_LIBTOOLIZE="$(type -p libtoolize)"
 
         if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
           echo "Couldn't find libtoolize, it is required"
@@ -1267,11 +1282,11 @@
       fi
     fi
 
-    if $VERBOSE; then
+    if $verbose; then
       LIBTOOLIZE_OPTIONS="--verbose $BOOTSTRAP_LIBTOOLIZE_OPTIONS"
     fi
 
-    if $DEBUG; then
+    if $debug; then
       LIBTOOLIZE_OPTIONS="--debug $BOOTSTRAP_LIBTOOLIZE_OPTIONS"
     fi
 
@@ -1281,32 +1296,32 @@
 
   # Test the ENV AUTOMAKE if it exists
   if [[ -n "$AUTOMAKE" ]]; then
-    run $AUTOMAKE '--help'    &> /dev/null    || die "Failed to run AUTOMAKE:$AUTOMAKE"
+    run "$AUTOMAKE" '--help'    &> /dev/null    || die "Failed to run AUTOMAKE:$AUTOMAKE"
   fi
 
   # Test the ENV AUTOCONF if it exists
   if [[ -n "$AUTOCONF" ]]; then
-    run $AUTOCONF '--help'    &> /dev/null    || die "Failed to run AUTOCONF:$AUTOCONF"
+    run "$AUTOCONF" '--help'    &> /dev/null    || die "Failed to run AUTOCONF:$AUTOCONF"
   fi
 
   # Test the ENV AUTOHEADER if it exists
   if [[ -n "$AUTOHEADER" ]]; then
-    run $AUTOHEADER '--help'  &> /dev/null    || die "Failed to run AUTOHEADER:$AUTOHEADER"
+    run "$AUTOHEADER" '--help'  &> /dev/null    || die "Failed to run AUTOHEADER:$AUTOHEADER"
   fi
 
   # Test the ENV AUTOM4TE if it exists
   if [[ -n "$AUTOM4TE" ]]; then
-    run $AUTOM4TE '--help'    &> /dev/null    || die "Failed to run AUTOM4TE:$AUTOM4TE"
+    run "$AUTOM4TE" '--help'    &> /dev/null    || die "Failed to run AUTOM4TE:$AUTOM4TE"
   fi
 
   # Test the ENV AUTOHEADER if it exists, if not we add one and add --install
   if [[ -z "$ACLOCAL" ]]; then
     ACLOCAL="aclocal --install"
   fi
-  run $ACLOCAL '--help'  &> /dev/null    || die "Failed to run ACLOCAL:$ACLOCAL"
+  run "$ACLOCAL" '--help'  &> /dev/null    || die "Failed to run ACLOCAL:$ACLOCAL"
 
   if [[ -z "$AUTORECONF" ]]; then
-    AUTORECONF=`type -p autoreconf`
+    AUTORECONF="$(type -p autoreconf)"
 
     if [[ -z "$AUTORECONF" ]]; then
       die "Couldn't find autoreconf"
@@ -1317,13 +1332,13 @@
     fi
   fi
 
-  run $AUTORECONF '--help'  &> /dev/null    || die "Failed to run AUTORECONF:$AUTORECONF"
+  run "$AUTORECONF" '--help'  &> /dev/null    || die "Failed to run AUTORECONF:$AUTORECONF"
 }
 
-function print_setup ()
+print_setup ()
 {
-  saved_debug_status=$DEBUG
-  if $DEBUG; then
+  local saved_debug_status=$debug
+  if $debug; then
     disable_debug
   fi
 
@@ -1348,11 +1363,11 @@
     echo "--configure"
   fi
 
-  if $DEBUG_OPTION; then
+  if $opt_debug; then
     echo "--debug"
   fi
 
-  if $PRINT_SETUP_OPTION; then
+  if $print_setup_opt; then
     echo "--print-env"
   fi
 
@@ -1360,7 +1375,7 @@
     echo "--target=$TARGET_OPTION_ARG"
   fi
 
-  if $VERBOSE_OPTION; then
+  if $opt_verbose; then
     echo "--verbose"
   fi
 
@@ -1384,17 +1399,18 @@
     echo "VCS_CHECKOUT=$VCS_CHECKOUT"
   fi
 
-  if $VERBOSE; then
-    echo "VERBOSE=true"
-  fi
-
-  if $DEBUG; then
-    echo "DEBUG=true"
+  if $debug; then
+    echo "debug=true"
   fi
 
   if [[ -n "$WARNINGS" ]]; then
     echo "WARNINGS=$WARNINGS"
   fi
+
+  if $saved_debug_status; then
+    echo "DEBUG=true"
+  fi
+
   echo '----------------------------------------------' 
 
   if $saved_debug_status; then
@@ -1402,7 +1418,7 @@
   fi
 }
 
-function make_clean_option ()
+make_clean_option ()
 {
   run_configure_if_required
 
@@ -1415,7 +1431,7 @@
   fi
 }
 
-function make_for_autoreconf ()
+make_for_autoreconf ()
 {
   if [ -f 'Makefile' ]; then
     make_maintainer_clean
@@ -1426,8 +1442,9 @@
   assert_no_file 'Makefile'
 }
 
-function check_make_target()
+check_make_target()
 {
+  local ret=0
   case $1 in
     'self')
       ;;
@@ -1481,20 +1498,21 @@
       ;;
     *)
       echo "Matched default"
-      return 1
+      ret=1
       ;;
   esac
 
-  return 0
+  return $ret
 }
 
-function bootstrap ()
+execute_job ()
 {
   determine_target_platform
 
   determine_vcs
 
   # Set up whatever we need to do to use autoreconf later
+  use_libtool=false
   require_libtoolise
   if ! autoreconf_setup; then
     return 1
@@ -1504,13 +1522,13 @@
     MAKE_TARGET="make_default"
   fi
 
-  if $PRINT_SETUP_OPTION -o  $DEBUG; then
+  if $print_setup_opt -o  $debug; then
     echo 
     print_setup
     echo 
 
     # Exit if all we were looking for were the currently used options
-    if $PRINT_SETUP_OPTION; then
+    if $print_setup_opt; then
       exit
     fi
   fi
@@ -1526,7 +1544,12 @@
   # We should always have a target by this point
   assert MAKE_TARGET
 
-  local MAKE_TARGET_ARRAY=($MAKE_TARGET)
+  if $CLEAN_OPTION; then
+    make_maintainer_clean
+  fi
+
+  local MAKE_TARGET_ARRAY
+  MAKE_TARGET_ARRAY=( $MAKE_TARGET )
 
   for target in "${MAKE_TARGET_ARRAY[@]}"
   do
@@ -1539,6 +1562,10 @@
       fi
     fi
 
+    if $jenkins_build_environment; then
+      use_banner $target
+    fi
+
     local snapshot_run=false
     local valgrind_run=false
 
@@ -1568,6 +1595,7 @@
         make_default
         ;;
       'clang')
+        make_distclean
         if ! check_clang; then
           die "clang was not found"
         fi
@@ -1577,6 +1605,7 @@
         fi
         ;;
       'clang-analyzer')
+        make_distclean
         if ! check_clang_analyzer; then
           die "clang-analyzer was not found"
         fi
@@ -1589,10 +1618,7 @@
         fi
         ;;
       'mingw')
-        if ! check_mingw; then
-          die "mingw was not found"
-        fi
-
+        make_distclean
         if ! make_for_mingw; then
           die "Failed to build mingw: $?"
         fi
@@ -1609,7 +1635,6 @@
         make_darwin_malloc
         ;;
       'valgrind')
-        make_maintainer_clean 
         make_valgrind
         ;;
       'universe')
@@ -1623,34 +1648,42 @@
         make_target "$target"
         ;;
     esac
-
-    if $jenkins_build_environment; then
-      if ! $snapshot_run; then
-        run_make_maintainer_clean_if_possible
-      fi
-    fi
-
   done
 }
 
-function main ()
+main ()
 {
+  # Are we running inside of Jenkins?
+  if [[ -n "$JENKINS_HOME" ]]; then 
+    declare -r jenkins_build_environment=true
+  else
+    declare -r jenkins_build_environment=false
+  fi
+
   # Variables we export
   declare -x VCS_CHECKOUT=
 
   # Variables we control globally
-  local MAKE_TARGET=
+  local -a MAKE_TARGET=
   local CONFIGURE=
+  local use_libtool=false
+  local verbose=false
+
+  #getop variables
+  local opt_debug=false
+  local opt_verbose=false
+
+  if [[ -n "$VERBOSE" ]]; then
+    verbose=true
+  fi
 
   # Options for getopt
   local AUTORECONF_OPTION=false
   local CLEAN_OPTION=false
   local CONFIGURE_OPTION=false
-  local DEBUG_OPTION=false
-  local PRINT_SETUP_OPTION=false
+  local print_setup_opt=false
   local TARGET_OPTION=false
   local TARGET_OPTION_ARG=
-  local VERBOSE_OPTION=false
 
   local OLD_CONFIGURE=
   local OLD_CONFIGURE_ARG=
@@ -1662,7 +1695,7 @@
   local AUTORECONF_REBUILD_HOST=false
   local AUTORECONF_REBUILD=false
 
-  local -r top_srcdir=`pwd`
+  local -r top_srcdir="$(pwd)"
 
   # Default configure
   if [ -z "$CONFIGURE" ]; then
@@ -1691,41 +1724,54 @@
 
   rebuild_host_os no_output
 
-  parse_command_line_options $@
+  local OPT_TARGET=
+  parse_command_line_options "$@"
+
+  nassert MAKE_TARGET
+
+  if [ -n "$OPT_TARGET" ]; then
+    MAKE_TARGET="$OPT_TARGET"
+  fi
 
   # If we are running under Jenkins we predetermine what tests we will run against
   # This MAKE_TARGET can be overridden by parse_command_line_options based MAKE_TARGET changes.
   # We don't want Jenkins overriding other variables, so we NULL them.
   if [ -z "$MAKE_TARGET" ]; then
     if $jenkins_build_environment; then
-      if [[ -n "$label" ]]; then
-        check_make_target $label
-        if [ $? -eq 0 ]; then
-          MAKE_TARGET="$label"
-        fi
-      fi
-      if [[ -n "$LABEL" ]]; then
-        check_make_target $LABEL
-        if [ $? -eq 0 ]; then
-          MAKE_TARGET="$LABEL"
-        fi
-      fi
-
-      if [ -z "$MAKE_TARGET" ]; then
-        MAKE_TARGET='jenkins'
+      if [[ -n "$JENKINS_TARGET" ]]; then
+        MAKE_TARGET="$JENKINS_TARGET"
+      else
+        if [[ -n "$label" ]]; then
+          check_make_target $label
+          if [ $? -eq 0 ]; then
+            MAKE_TARGET="$label"
+          fi
+        fi
+
+        if [[ -n "$LABEL" ]]; then
+          check_make_target $LABEL
+          if [ $? -eq 0 ]; then
+            MAKE_TARGET="$LABEL"
+          fi
+        fi
+
+        if [ -z "$MAKE_TARGET" ]; then
+          MAKE_TARGET='jenkins'
+        fi
       fi
     fi
   fi
 
-  bootstrap
+  execute_job
+  local ret=$?
 
   jobs -l
   wait
 
-  exit 0
+  exit $ret
 }
 
-function set_branch ()
+set_branch ()
 {
   if [ -z "$BRANCH" ]; then 
     if [ -z "$CI_PROJECT_TEAM" ]; then 
@@ -1747,7 +1793,7 @@
   fi
 }
 
-function merge ()
+merge ()
 {
   if [ -z "$VCS_CHECKOUT" ]; then
     die "Merges require VCS_CHECKOUT."
@@ -1767,21 +1813,21 @@
   fi
 }
 
-function enable_debug ()
+enable_debug ()
 {
-  if ! $DEBUG; then
-    local caller_loc=`caller`
-    if [ -n $1 ]; then
+  if ! $debug; then
+    local caller_loc="$(caller)"
+    if [[ -n "$1" ]]; then
       echo "$caller_loc Enabling debug: $1"
     else
       echo "$caller_loc Enabling debug"
     fi
     set -x
-    DEBUG=true
+    debug=true
   fi
 }
 
-function usage ()
+usage ()
 {
   cat << EOF
   Usage: $program_name [OPTION]..
@@ -1793,76 +1839,83 @@
 EOF
 }
 
-function disable_debug ()
+disable_debug ()
 {
   set +x
-  DEBUG=true
-}
-
-# Script begins here
-
-program_name=$0
-
-env_debug_enabled=false
-if [[ -n "$JENKINS_HOME" ]]; then 
-  declare -r jenkins_build_environment=true
-else
-  declare -r jenkins_build_environment=false
-fi
-
-export ACLOCAL
-export AUTOCONF
-export AUTOHEADER
-export AUTOM4TE
-export AUTOMAKE
-export AUTORECONF
-export CONFIGURE_ARG
-export DEBUG
-export GNU_BUILD_FLAGS
-export LIBTOOLIZE
-export LIBTOOLIZE_OPTIONS
-export MAKE
-export PREFIX_ARG
-export TESTS_ENVIRONMENT
-export VERBOSE
-export WARNINGS
-
-case $OSTYPE in
-  darwin*)
-    export MallocGuardEdges
-    export MallocErrorAbort
-    export MallocScribble
-    ;;
-esac
-
-# We check for DEBUG twice, once before we source the config file, and once afterward
-env_debug_enabled=false
-if [[ -n "$DEBUG" ]]; then
-  env_debug_enabled=true
-  enable_debug
-  print_setup
-fi
-
-# Variables which only can be set by .bootstrap
-BOOTSTRAP_SNAPSHOT=false
-BOOTSTRAP_SNAPSHOT_CHECK=
-
-if [ -f '.bootstrap' ]; then
-  source '.bootstrap'
-fi
-
-if $env_debug_enabled; then
-  enable_debug
-else
+  debug=false
+}
+
+check_shell ()
+{
+  if [ -x '/usr/local/bin/shellcheck' ]; then
+    /usr/local/bin/shellcheck "$1"
+    local ret=$?
+
+    if [ "$ret" -ne 0 ]; then
+      die "$1 failed shellcheck"
+    fi
+  fi
+}
+
+bootstrap ()
+{
+  check_shell 'bootstrap.sh'
+  local env_debug_enabled=false
+  local debug=false
+
+  export ACLOCAL
+  export AUTOCONF
+  export AUTOHEADER
+  export AUTOM4TE
+  export AUTOMAKE
+  export AUTORECONF
+  export CONFIGURE_ARG
+  export DEBUG
+  export GNU_BUILD_FLAGS
+  export LIBTOOLIZE
+  export LIBTOOLIZE_OPTIONS
+  export MAKE
+  export PREFIX_ARG
+  export TESTS_ENVIRONMENT
+  export VERBOSE
+  export WARNINGS
+
+  case $OSTYPE in
+    darwin*)
+      export MallocGuardEdges
+      export MallocErrorAbort
+      export MallocScribble
+      ;;
+  esac
+
+  # We check for DEBUG twice, once before we source the config file, and once afterward
   if [[ -n "$DEBUG" ]]; then
+    env_debug_enabled=true
+  fi
+
+  # Variables which only can be set by .bootstrap
+  BOOTSTRAP_SNAPSHOT=false
+  BOOTSTRAP_SNAPSHOT_CHECK=
+
+  if [ -f '.bootstrap' ]; then
+    source '.bootstrap'
+  fi
+
+  # We do this in order to protect the case where DEBUG that came from the ENV (i.e. it overrides what is found in .bootstrap
+  if $env_debug_enabled; then
+    enable_debug
+  elif [[ -n "$DEBUG" ]]; then
     enable_debug "Enabling DEBUG from '.bootstrap'"
+  fi
+
+  if $env_debug_enabled; then
     print_setup
   fi
-fi
-
-# We do this in order to protect the case where DEBUG
-if ! $env_debug_enabled; then
-  DEBUG=false
-fi
-
-main $@
+
+
+  main "$@"
+}
+
+# Script begins here
+declare -r program_name="$0"
+bootstrap "$@"

=== modified file 'clients/include.am'
--- clients/include.am	2012-11-25 14:12:14 +0000
+++ clients/include.am	2013-06-14 07:11:24 +0000
@@ -42,7 +42,8 @@
 noinst_HEADERS+= clients/utilities.h
 
 noinst_LTLIBRARIES+= clients/libutilities.la
-clients_libutilities_la_SOURCES= clients/utilities.cc
+clients_libutilities_la_SOURCES=
+clients_libutilities_la_SOURCES+= clients/utilities.cc
 
 clients_memcat_SOURCES= clients/memcat.cc
 clients_memcat_LDADD= $(CLIENTS_LDADDS)

=== modified file 'clients/memcat.cc'
--- clients/memcat.cc	2013-04-03 13:14:23 +0000
+++ clients/memcat.cc	2013-06-14 07:11:24 +0000
@@ -80,7 +80,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t)opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;
@@ -186,6 +186,8 @@
 }
 
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 void options_parse(int argc, char *argv[])
 {
   int option_index= 0;
@@ -263,3 +265,4 @@
     }
   }
 }
+#pragma GCC diagnostic pop

=== modified file 'clients/memcp.cc'
--- clients/memcp.cc	2013-05-04 09:20:42 +0000
+++ clients/memcp.cc	2013-06-14 07:11:24 +0000
@@ -160,7 +160,7 @@
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, opt_binary);
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memdump.cc'
--- clients/memdump.cc	2013-05-04 09:20:42 +0000
+++ clients/memdump.cc	2013-06-14 07:11:24 +0000
@@ -102,7 +102,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t)opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memexist.cc'
--- clients/memexist.cc	2013-04-03 13:14:23 +0000
+++ clients/memexist.cc	2013-06-14 07:11:24 +0000
@@ -70,7 +70,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t) opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memflush.cc'
--- clients/memflush.cc	2013-04-20 09:51:38 +0000
+++ clients/memflush.cc	2013-06-14 07:11:24 +0000
@@ -69,7 +69,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t) opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memping.cc'
--- clients/memping.cc	2013-04-20 09:51:38 +0000
+++ clients/memping.cc	2013-06-14 07:11:24 +0000
@@ -95,6 +95,8 @@
 }
 
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 void options_parse(int argc, char *argv[])
 {
   memcached_programs_help_st help_options[]=
@@ -198,3 +200,4 @@
     exit(EXIT_SUCCESS);
   }
 }
+#pragma GCC diagnostic pop

=== modified file 'clients/memrm.cc'
--- clients/memrm.cc	2013-04-20 09:51:38 +0000
+++ clients/memrm.cc	2013-06-14 07:11:24 +0000
@@ -73,7 +73,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t) opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memstat.cc'
--- clients/memstat.cc	2013-04-03 13:14:23 +0000
+++ clients/memstat.cc	2013-06-14 07:11:24 +0000
@@ -138,7 +138,7 @@
   memcached_return_t rc= memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/memtouch.cc'
--- clients/memtouch.cc	2013-04-03 13:14:23 +0000
+++ clients/memtouch.cc	2013-06-14 07:11:24 +0000
@@ -77,7 +77,7 @@
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t)opt_binary);
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (opt_username and libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     memcached_free(memc);
     std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;

=== modified file 'clients/utilities.cc'
--- clients/utilities.cc	2013-03-13 03:23:07 +0000
+++ clients/utilities.cc	2013-06-14 07:11:24 +0000
@@ -73,6 +73,8 @@
 }
 
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 static const char *lookup_help(memcached_options option)
 {
   switch (option)
@@ -106,12 +108,12 @@
   case OPT_STAT_ARGS: return "Argument for statistics";
   case OPT_SERVER_VERSION: return "Memcached daemon software version";
   default:
-                      break;
+                           break;
   };
 
-  assert(0);
-  return "forgot to document this function :)";
+  return "Programmer error, function for options not implemented";
 }
+#pragma GCC diagnostic pop
 
 void help_command(const char *command_name, const char *description,
                   const struct option *long_options,
@@ -131,7 +133,9 @@
     printf("\t --%s%c\n", long_options[x].name,
            long_options[x].has_arg ? '=' : ' ');
     if ((help_message= lookup_help(memcached_options(long_options[x].val))))
+    {
       printf("\t\t%s\n", help_message);
+    }
   }
 
   printf("\n");

=== modified file 'configure.ac'
--- configure.ac	2013-05-04 09:20:42 +0000
+++ configure.ac	2013-06-14 07:11:24 +0000
@@ -88,6 +88,7 @@
 AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false])
 AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false])
 AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support])
+AC_SUBST([LIBMEMCACHED_CFLAGS])
 
 AM_CONDITIONAL([BUILDING_GEARMAN],[false])
 

=== modified file 'docs/include.am'
--- docs/include.am	2013-04-28 11:30:05 +0000
+++ docs/include.am	2013-06-14 07:11:24 +0000
@@ -43,59 +43,59 @@
 	@cp -r ${top_builddir}/html $(htmldir)/
 
 html-local: docs/conf.py
-	@PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ${top_builddir}/html
+	@PYTHONPATH=${top_srcdir}/docs @SPHINXBUILD@ -b html $(ALLSPHINXOPTS) ${top_builddir}/html
 
 singlehtml: html-local
-	@PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
+	@PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
 
 pickle: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
 json: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/json
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b json $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
 htmlhelp: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/htmlhelp
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b htmlhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."
 
 epub: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(SPHINX_BUILDDIR)/epub."
 
 latex: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(SPHINX_BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
 latexpdf: latex
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	make -C $(SPHINX_BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."
 
 text: docs/conf.py
-	@PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
+	@PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
 
 man:
-	@PYTHONPATH=$(SPHINX_BUILDDIR)/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
+	@PYTHONPATH=$(SPHINX_BUILDDIR)/docs  @SPHINXBUILD@ -b man $(ALLSPHINXOPTS) ${top_builddir}/man
 
 
 changes: docs/conf.py
-	@PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
+	@PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
 
 linkcheck: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
 
 doctest: docs/conf.py
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest
+	PYTHONPATH=${top_srcdir}/docs  @SPHINXBUILD@ -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(SPHINX_BUILDDIR)/doctest/output.txt."

=== modified file 'libhashkit/digest.cc'
--- libhashkit/digest.cc	2012-11-21 12:05:17 +0000
+++ libhashkit/digest.cc	2013-06-14 07:11:24 +0000
@@ -42,6 +42,8 @@
   return self->base_hash.function(key, key_length, self->base_hash.context);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 uint32_t libhashkit_digest(const char *key, size_t key_length, hashkit_hash_algorithm_t hash_algorithm)
 {
   switch (hash_algorithm)
@@ -91,3 +93,4 @@
 
   return 1;
 }
+#pragma GCC diagnostic push

=== added file 'libmemcached-1.2/feature.h'
--- libmemcached-1.2/feature.h	1970-01-01 00:00:00 +0000
+++ libmemcached-1.2/feature.h	2013-06-14 07:11:24 +0000
@@ -0,0 +1,53 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+enum libmemcached_feature_t {
+    LIBMEMCACHED_FEATURE_HAS_SASL,
+    LIBMEMCACHED_FEATURE_MAX
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBMEMCACHED_API
+bool libmemcached_has_feature(enum libmemcached_feature_t arg);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

=== modified file 'libmemcached-1.2/include.am'
--- libmemcached-1.2/include.am	2012-10-13 23:12:16 +0000
+++ libmemcached-1.2/include.am	2013-06-14 07:11:24 +0000
@@ -27,6 +27,7 @@
 nobase_include_HEADERS+= libmemcached-1.2/error.h 
 nobase_include_HEADERS+= libmemcached-1.2/exception.hpp 
 nobase_include_HEADERS+= libmemcached-1.2/exist.h 
+nobase_include_HEADERS+= libmemcached-1.2/feature.h 
 nobase_include_HEADERS+= libmemcached-1.2/fetch.h 
 nobase_include_HEADERS+= libmemcached-1.2/flush.h 
 nobase_include_HEADERS+= libmemcached-1.2/flush_buffers.h 

=== modified file 'libmemcached-1.2/memcached.h'
--- libmemcached-1.2/memcached.h	2013-04-03 13:14:23 +0000
+++ libmemcached-1.2/memcached.h	2013-06-14 07:11:24 +0000
@@ -59,6 +59,8 @@
 #include <libmemcached-1.2/configure.h>
 #include <libmemcached-1.2/platform.h>
 
+#include <libmemcached-1.2/feature.h>
+
 #include <libmemcached-1.2/limits.h>
 #include <libmemcached-1.2/defaults.h>
 

=== modified file 'libmemcached-1.2/sasl.h'
--- libmemcached-1.2/sasl.h	2012-10-13 23:12:16 +0000
+++ libmemcached-1.2/sasl.h	2013-06-14 07:11:24 +0000
@@ -38,9 +38,9 @@
 #pragma once
 
 #if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
-#include <sasl/sasl.h>
+# include <sasl/sasl.h>
 #else
-#define sasl_callback_t void
+# define sasl_callback_t void
 #endif
 
 #ifdef __cplusplus

=== modified file 'libmemcached/connect.cc'
--- libmemcached/connect.cc	2013-04-21 08:19:20 +0000
+++ libmemcached/connect.cc	2013-06-14 07:11:24 +0000
@@ -407,6 +407,7 @@
     assert(error == 0);
   }
 
+#if defined(TCP_KEEPIDLE) && TCP_KEEPIDLE
   if (TCP_KEEPIDLE)
   {
     if (server->root->tcp_keepidle > 0)
@@ -417,6 +418,7 @@
       assert(error == 0);
     }
   }
+#endif
 
   if (server->root->send_size > 0)
   {
@@ -743,7 +745,7 @@
     return rc;
   }
 
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT and server->root->sasl.callbacks and memcached_is_udp(server->root))
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and server->root->sasl.callbacks and memcached_is_udp(server->root))
   {
     return memcached_set_error(*server, MEMCACHED_INVALID_HOST_PROTOCOL, MEMCACHED_AT, memcached_literal_param("SASL is not supported for UDP connections"));
   }
@@ -760,8 +762,7 @@
   case MEMCACHED_CONNECTION_TCP:
     rc= network_connect(server);
 
-#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT)
-    if (LIBMEMCACHED_WITH_SASL_SUPPORT)
+    if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL))
     {
       if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks)
       {
@@ -773,7 +774,6 @@
         }
       }
     }
-#endif
     break;
 
   case MEMCACHED_CONNECTION_UNIX_SOCKET:

=== modified file 'libmemcached/csl/parser.yy'
--- libmemcached/csl/parser.yy	2013-02-12 05:44:21 +0000
+++ libmemcached/csl/parser.yy	2013-06-14 07:11:24 +0000
@@ -65,8 +65,13 @@
 #include <libmemcached/csl/symbol.h>
 #include <libmemcached/csl/scanner.h>
 
+#ifdef __clang__
+# pragma GCC diagnostic ignored "-Wunreachable-code"
+#endif
+
 #ifndef __INTEL_COMPILER
 # pragma GCC diagnostic ignored "-Wold-style-cast"
+# pragma GCC diagnostic ignored "-Wunreachable-code"
 #endif
 
 #ifndef __INTEL_COMPILER

=== modified file 'libmemcached/csl/scanner.l'
--- libmemcached/csl/scanner.l	2013-01-30 02:46:06 +0000
+++ libmemcached/csl/scanner.l	2013-06-14 07:11:24 +0000
@@ -42,6 +42,10 @@
 #include <libmemcached/csl/parser.h>
 #include <libmemcached/csl/symbol.h>
 
+#ifdef __clang__
+# pragma GCC diagnostic ignored "-Wunreachable-code"
+#endif
+
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wsign-compare"

=== added file 'libmemcached/feature.cc'
--- libmemcached/feature.cc	1970-01-01 00:00:00 +0000
+++ libmemcached/feature.cc	2013-06-14 07:11:24 +0000
@@ -0,0 +1,51 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <libmemcached/common.h>
+
+bool libmemcached_has_feature(enum libmemcached_feature_t arg)
+{
+  switch (arg)
+  {
+    case LIBMEMCACHED_FEATURE_HAS_SASL:
+      return LIBMEMCACHED_WITH_SASL_SUPPORT;
+
+    case LIBMEMCACHED_FEATURE_MAX:
+      break;
+  }
+
+  return false;
+}

=== added file 'libmemcached/feature.h'
--- libmemcached/feature.h	1970-01-01 00:00:00 +0000
+++ libmemcached/feature.h	2013-06-14 07:11:24 +0000
@@ -0,0 +1,37 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once

=== modified file 'libmemcached/flag.cc'
--- libmemcached/flag.cc	2012-07-09 09:20:53 +0000
+++ libmemcached/flag.cc	2013-06-14 07:11:24 +0000
@@ -86,7 +86,9 @@
     return memcached_is_fetching_version(&memc);
   }
 
-  abort();
+  assert_msg(false, "Programmer error, unknown flag provided");
+
+  return false;
 }
 
 void memcached_flag(memcached_st& memc, const memcached_flag_t flag, const bool arg)

=== modified file 'libmemcached/hosts.cc'
--- libmemcached/hosts.cc	2013-04-21 08:19:20 +0000
+++ libmemcached/hosts.cc	2013-06-14 07:11:24 +0000
@@ -221,6 +221,7 @@
         float pct= (float)list[host_index].weight / (float)total_weight;
         pointer_per_server= (uint32_t) ((::floor((float) (pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)live_servers + 0.0000000001))) * 4);
         pointer_per_hash= 4;
+#if defined(DEBUG) && DEBUG
         if (DEBUG)
         {
           printf("ketama_weighted:%s|%d|%llu|%u\n",
@@ -229,6 +230,7 @@
                  (unsigned long long)list[host_index].weight,
                  pointer_per_server);
         }
+#endif
     }
 
 
@@ -255,10 +257,12 @@
                                      memcached_literal_param("snprintf(sizeof(sort_host))"));
         }
 
+#if defined(DEBUG) && DEBUG
         if (DEBUG)
         {
           fprintf(stdout, "update_continuum: key is %s\n", sort_host);
         }
+#endif
 
         if (memcached_is_weighted_ketama(ptr))
         {
@@ -335,6 +339,7 @@
   ptr->ketama.continuum_points_counter= pointer_counter;
   qsort(ptr->ketama.continuum, ptr->ketama.continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
 
+#if defined(DEBUG) && DEBUG
   if (DEBUG)
   {
     for (uint32_t pointer_index= 0; memcached_server_count(ptr) && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++)
@@ -342,6 +347,7 @@
       WATCHPOINT_ASSERT(ptr->ketama.continuum[pointer_index].value <= ptr->ketama.continuum[pointer_index + 1].value);
     }
   }
+#endif
 
   return MEMCACHED_SUCCESS;
 }

=== modified file 'libmemcached/include.am'
--- libmemcached/include.am	2013-05-05 07:37:08 +0000
+++ libmemcached/include.am	2013-06-14 07:11:24 +0000
@@ -20,6 +20,7 @@
 noinst_HEADERS+= libmemcached/do.hpp 
 noinst_HEADERS+= libmemcached/encoding_key.h 
 noinst_HEADERS+= libmemcached/error.hpp 
+noinst_HEADERS+= libmemcached/feature.h
 noinst_HEADERS+= libmemcached/flag.hpp 
 noinst_HEADERS+= libmemcached/initialize_query.h 
 noinst_HEADERS+= libmemcached/instance.hpp
@@ -79,6 +80,7 @@
 libmemcached_libmemcached_la_SOURCES+= libmemcached/dump.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/error.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/exist.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/feature.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/fetch.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/flag.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/flush.cc

=== modified file 'libmemcached/memcached.cc'
--- libmemcached/memcached.cc	2013-04-03 13:14:23 +0000
+++ libmemcached/memcached.cc	2013-06-14 07:11:24 +0000
@@ -151,7 +151,7 @@
 
   memcached_error_free(*ptr);
 
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT and ptr->sasl.callbacks)
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and ptr->sasl.callbacks)
   {
     memcached_destroy_sasl_auth_data(ptr);
   }
@@ -381,7 +381,7 @@
   new_clone->configure.filename= memcached_array_clone(new_clone, source->_namespace);
   new_clone->configure.version= source->configure.version;
 
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT and source->sasl.callbacks)
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) and source->sasl.callbacks)
   {
     if (memcached_failed(memcached_clone_sasl(new_clone, source)))
     {

=== modified file 'libmemcached/response.cc'
--- libmemcached/response.cc	2013-04-03 13:14:23 +0000
+++ libmemcached/response.cc	2013-06-14 07:11:24 +0000
@@ -827,7 +827,6 @@
     case PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND:
     default:
       return memcached_set_error(*instance, MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_AT);
-      break;
     }
   }
 

=== modified file 'libmemcached/sasl.cc'
--- libmemcached/sasl.cc	2013-03-31 23:24:29 +0000
+++ libmemcached/sasl.cc	2013-06-14 07:11:24 +0000
@@ -135,10 +135,12 @@
 
 memcached_return_t memcached_sasl_authenticate_connection(memcached_instance_st* server)
 {
+#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT == 0
   if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
   {
     return MEMCACHED_NOT_SUPPORTED;
   }
+#endif
 
   if (server == NULL)
   {
@@ -324,197 +326,197 @@
                                                 const char *username,
                                                 const char *password)
 {
-  Memcached* ptr= memcached2Memcached(shell);
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
-  {
-    return MEMCACHED_NOT_SUPPORTED;
-  }
-
-  if (ptr == NULL or username == NULL or password == NULL)
-  {
-    return MEMCACHED_INVALID_ARGUMENTS;
-  }
-
-  memcached_return_t ret;
-  if (memcached_failed(ret= memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
-  {
-    return memcached_set_error(*ptr, ret, MEMCACHED_AT, memcached_literal_param("Unable change to binary protocol which is required for SASL."));
-  }
-
-  memcached_destroy_sasl_auth_data(ptr);
-
-  sasl_callback_t *callbacks= libmemcached_xcalloc(ptr, 4, sasl_callback_t);
-  size_t password_length= strlen(password);
-  size_t username_length= strlen(username);
-  char *name= (char *)libmemcached_malloc(ptr, username_length +1);
-  sasl_secret_t *secret= (sasl_secret_t*)libmemcached_malloc(ptr, password_length +1 + sizeof(sasl_secret_t));
-
-  if (callbacks == NULL or name == NULL or secret == NULL)
-  {
-    libmemcached_free(ptr, callbacks);
-    libmemcached_free(ptr, name);
-    libmemcached_free(ptr, secret);
-    return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
-  }
-
-  secret->len= password_length;
-  memcpy(secret->data, password, password_length);
-  secret->data[password_length]= 0;
-
-  callbacks[0].id= SASL_CB_USER;
-  callbacks[0].proc= (int (*)())get_username;
-  callbacks[0].context= strncpy(name, username, username_length +1);
-  callbacks[1].id= SASL_CB_AUTHNAME;
-  callbacks[1].proc= (int (*)())get_username;
-  callbacks[1].context= name;
-  callbacks[2].id= SASL_CB_PASS;
-  callbacks[2].proc= (int (*)())get_password;
-  callbacks[2].context= secret;
-  callbacks[3].id= SASL_CB_LIST_END;
-
-  ptr->sasl.callbacks= callbacks;
-  ptr->sasl.is_allocated= true;
-
-  return MEMCACHED_SUCCESS;
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL))
+  {
+    Memcached* ptr= memcached2Memcached(shell);
+
+    if (ptr == NULL or username == NULL or password == NULL)
+    {
+      return MEMCACHED_INVALID_ARGUMENTS;
+    }
+
+    memcached_return_t ret;
+    if (memcached_failed(ret= memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
+    {
+      return memcached_set_error(*ptr, ret, MEMCACHED_AT, memcached_literal_param("Unable change to binary protocol which is required for SASL."));
+    }
+
+    memcached_destroy_sasl_auth_data(ptr);
+
+    sasl_callback_t *callbacks= libmemcached_xcalloc(ptr, 4, sasl_callback_t);
+    size_t password_length= strlen(password);
+    size_t username_length= strlen(username);
+    char *name= (char *)libmemcached_malloc(ptr, username_length +1);
+    sasl_secret_t *secret= (sasl_secret_t*)libmemcached_malloc(ptr, password_length +1 + sizeof(sasl_secret_t));
+
+    if (callbacks == NULL or name == NULL or secret == NULL)
+    {
+      libmemcached_free(ptr, callbacks);
+      libmemcached_free(ptr, name);
+      libmemcached_free(ptr, secret);
+      return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+    }
+
+    secret->len= password_length;
+    memcpy(secret->data, password, password_length);
+    secret->data[password_length]= 0;
+
+    callbacks[0].id= SASL_CB_USER;
+    callbacks[0].proc= (int (*)())get_username;
+    callbacks[0].context= strncpy(name, username, username_length +1);
+    callbacks[1].id= SASL_CB_AUTHNAME;
+    callbacks[1].proc= (int (*)())get_username;
+    callbacks[1].context= name;
+    callbacks[2].id= SASL_CB_PASS;
+    callbacks[2].proc= (int (*)())get_password;
+    callbacks[2].context= secret;
+    callbacks[3].id= SASL_CB_LIST_END;
+
+    ptr->sasl.callbacks= callbacks;
+    ptr->sasl.is_allocated= true;
+
+    return MEMCACHED_SUCCESS;
+  }
+  return MEMCACHED_NOT_SUPPORTED;
 }
 
 memcached_return_t memcached_destroy_sasl_auth_data(memcached_st *shell)
 {
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
-  {
-    return MEMCACHED_NOT_SUPPORTED;
-  }
-
-  Memcached* ptr= memcached2Memcached(shell);
-  if (ptr == NULL)
-  {
-    return MEMCACHED_INVALID_ARGUMENTS;
-  }
-
-  if (ptr->sasl.callbacks == NULL)
-  {
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL))
+  {
+    Memcached* ptr= memcached2Memcached(shell);
+    if (ptr == NULL)
+    {
+      return MEMCACHED_INVALID_ARGUMENTS;
+    }
+
+    if (ptr->sasl.callbacks == NULL)
+    {
+      return MEMCACHED_SUCCESS;
+    }
+
+    if (ptr->sasl.is_allocated)
+    {
+      libmemcached_free(ptr, ptr->sasl.callbacks[0].context);
+      libmemcached_free(ptr, ptr->sasl.callbacks[2].context);
+      libmemcached_free(ptr, (void*)ptr->sasl.callbacks);
+      ptr->sasl.is_allocated= false;
+    }
+
+    ptr->sasl.callbacks= NULL;
+
     return MEMCACHED_SUCCESS;
   }
 
-  if (ptr->sasl.is_allocated)
-  {
-    libmemcached_free(ptr, ptr->sasl.callbacks[0].context);
-    libmemcached_free(ptr, ptr->sasl.callbacks[2].context);
-    libmemcached_free(ptr, (void*)ptr->sasl.callbacks);
-    ptr->sasl.is_allocated= false;
-  }
-
-  ptr->sasl.callbacks= NULL;
-
-  return MEMCACHED_SUCCESS;
+  return MEMCACHED_NOT_SUPPORTED;
 }
 
 memcached_return_t memcached_clone_sasl(memcached_st *clone, const  memcached_st *source)
 {
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
-  {
-    return MEMCACHED_NOT_SUPPORTED;
-  }
-
-  if (clone == NULL or source == NULL)
-  {
-    return MEMCACHED_INVALID_ARGUMENTS;
-  }
-
-  if (source->sasl.callbacks == NULL)
-  {
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL))
+  {
+    if (clone == NULL or source == NULL)
+    {
+      return MEMCACHED_INVALID_ARGUMENTS;
+    }
+
+    if (source->sasl.callbacks == NULL)
+    {
+      return MEMCACHED_SUCCESS;
+    }
+
+    /* Hopefully we are using our own callback mechanisms.. */
+    if (source->sasl.callbacks[0].id == SASL_CB_USER &&
+        source->sasl.callbacks[0].proc ==  (int (*)())get_username &&
+        source->sasl.callbacks[1].id == SASL_CB_AUTHNAME &&
+        source->sasl.callbacks[1].proc ==  (int (*)())get_username &&
+        source->sasl.callbacks[2].id == SASL_CB_PASS &&
+        source->sasl.callbacks[2].proc ==  (int (*)())get_password &&
+        source->sasl.callbacks[3].id == SASL_CB_LIST_END)
+    {
+      sasl_secret_t *secret= (sasl_secret_t *)source->sasl.callbacks[2].context;
+      return memcached_set_sasl_auth_data(clone,
+                                          (const char*)source->sasl.callbacks[0].context,
+                                          (const char*)secret->data);
+    }
+
+    /*
+     * But we're not. It may work if we know what the user tries to pass
+     * into the list, but if we don't know the ID we don't know how to handle
+     * the context...
+     */
+    ptrdiff_t total= 0;
+
+    while (source->sasl.callbacks[total].id != SASL_CB_LIST_END)
+    {
+      switch (source->sasl.callbacks[total].id)
+      {
+        case SASL_CB_USER:
+        case SASL_CB_AUTHNAME:
+        case SASL_CB_PASS:
+          break;
+        default:
+          /* I don't know how to deal with this... */
+          return MEMCACHED_NOT_SUPPORTED;
+      }
+
+      ++total;
+    }
+
+    sasl_callback_t *callbacks= libmemcached_xcalloc(clone, total +1, sasl_callback_t);
+    if (callbacks == NULL)
+    {
+      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    }
+    memcpy(callbacks, source->sasl.callbacks, (total + 1) * sizeof(sasl_callback_t));
+
+    /* Now update the context... */
+    for (ptrdiff_t x= 0; x < total; ++x)
+    {
+      if (callbacks[x].id == SASL_CB_USER || callbacks[x].id == SASL_CB_AUTHNAME)
+      {
+        callbacks[x].context= (sasl_callback_t*)libmemcached_malloc(clone, strlen((const char*)source->sasl.callbacks[x].context));
+
+        if (callbacks[x].context == NULL)
+        {
+          /* Failed to allocate memory, clean up previously allocated memory */
+          for (ptrdiff_t y= 0; y < x; ++y)
+          {
+            libmemcached_free(clone, clone->sasl.callbacks[y].context);
+          }
+
+          libmemcached_free(clone, callbacks);
+          return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+        }
+        strncpy((char*)callbacks[x].context, (const char*)source->sasl.callbacks[x].context, sizeof(callbacks[x].context));
+      }
+      else
+      {
+        sasl_secret_t *src= (sasl_secret_t *)source->sasl.callbacks[x].context;
+        sasl_secret_t *n= (sasl_secret_t*)libmemcached_malloc(clone, src->len + 1 + sizeof(*n));
+        if (n == NULL)
+        {
+          /* Failed to allocate memory, clean up previously allocated memory */
+          for (ptrdiff_t y= 0; y < x; ++y)
+          {
+            libmemcached_free(clone, clone->sasl.callbacks[y].context);
+          }
+
+          libmemcached_free(clone, callbacks);
+          return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+        }
+        memcpy(n, src, src->len + 1 + sizeof(*n));
+        callbacks[x].context= n;
+      }
+    }
+
+    clone->sasl.callbacks= callbacks;
+    clone->sasl.is_allocated= true;
+
     return MEMCACHED_SUCCESS;
   }
 
-  /* Hopefully we are using our own callback mechanisms.. */
-  if (source->sasl.callbacks[0].id == SASL_CB_USER &&
-      source->sasl.callbacks[0].proc ==  (int (*)())get_username &&
-      source->sasl.callbacks[1].id == SASL_CB_AUTHNAME &&
-      source->sasl.callbacks[1].proc ==  (int (*)())get_username &&
-      source->sasl.callbacks[2].id == SASL_CB_PASS &&
-      source->sasl.callbacks[2].proc ==  (int (*)())get_password &&
-      source->sasl.callbacks[3].id == SASL_CB_LIST_END)
-  {
-    sasl_secret_t *secret= (sasl_secret_t *)source->sasl.callbacks[2].context;
-    return memcached_set_sasl_auth_data(clone,
-                                        (const char*)source->sasl.callbacks[0].context,
-                                        (const char*)secret->data);
-  }
-
-  /*
-   * But we're not. It may work if we know what the user tries to pass
-   * into the list, but if we don't know the ID we don't know how to handle
-   * the context...
- */
-  ptrdiff_t total= 0;
-
-  while (source->sasl.callbacks[total].id != SASL_CB_LIST_END)
-  {
-    switch (source->sasl.callbacks[total].id)
-    {
-    case SASL_CB_USER:
-    case SASL_CB_AUTHNAME:
-    case SASL_CB_PASS:
-      break;
-    default:
-      /* I don't know how to deal with this... */
-      return MEMCACHED_NOT_SUPPORTED;
-    }
-
-    ++total;
-  }
-
-  sasl_callback_t *callbacks= libmemcached_xcalloc(clone, total +1, sasl_callback_t);
-  if (callbacks == NULL)
-  {
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-  memcpy(callbacks, source->sasl.callbacks, (total + 1) * sizeof(sasl_callback_t));
-
-  /* Now update the context... */
-  for (ptrdiff_t x= 0; x < total; ++x)
-  {
-    if (callbacks[x].id == SASL_CB_USER || callbacks[x].id == SASL_CB_AUTHNAME)
-    {
-      callbacks[x].context= (sasl_callback_t*)libmemcached_malloc(clone, strlen((const char*)source->sasl.callbacks[x].context));
-
-      if (callbacks[x].context == NULL)
-      {
-        /* Failed to allocate memory, clean up previously allocated memory */
-        for (ptrdiff_t y= 0; y < x; ++y)
-        {
-          libmemcached_free(clone, clone->sasl.callbacks[y].context);
-        }
-
-        libmemcached_free(clone, callbacks);
-        return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-      }
-      strncpy((char*)callbacks[x].context, (const char*)source->sasl.callbacks[x].context, sizeof(callbacks[x].context));
-    }
-    else
-    {
-      sasl_secret_t *src= (sasl_secret_t *)source->sasl.callbacks[x].context;
-      sasl_secret_t *n= (sasl_secret_t*)libmemcached_malloc(clone, src->len + 1 + sizeof(*n));
-      if (n == NULL)
-      {
-        /* Failed to allocate memory, clean up previously allocated memory */
-        for (ptrdiff_t y= 0; y < x; ++y)
-        {
-          libmemcached_free(clone, clone->sasl.callbacks[y].context);
-        }
-
-        libmemcached_free(clone, callbacks);
-        return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-      }
-      memcpy(n, src, src->len + 1 + sizeof(*n));
-      callbacks[x].context= n;
-    }
-  }
-
-  clone->sasl.callbacks= callbacks;
-  clone->sasl.is_allocated= true;
-
-  return MEMCACHED_SUCCESS;
+  return MEMCACHED_NOT_SUPPORTED;
 }
 
 #else
@@ -538,4 +540,14 @@
   return MEMCACHED_NOT_SUPPORTED;
 }
 
+memcached_return_t memcached_destroy_sasl_auth_data(memcached_st*)
+{
+  return MEMCACHED_NOT_SUPPORTED;
+}
+
+memcached_return_t memcached_sasl_authenticate_connection(memcached_instance_st*)
+{
+  return MEMCACHED_NOT_SUPPORTED;
+}
+
 #endif

=== modified file 'libmemcachedutil/pid.cc'
--- libmemcachedutil/pid.cc	2013-03-31 23:24:29 +0000
+++ libmemcachedutil/pid.cc	2013-06-14 07:11:24 +0000
@@ -105,7 +105,7 @@
   if (not ret)
     ret= &unused;
 
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     *ret= MEMCACHED_NOT_SUPPORTED;
     return pid;

=== modified file 'libmemcachedutil/ping.cc'
--- libmemcachedutil/ping.cc	2013-03-31 23:24:29 +0000
+++ libmemcachedutil/ping.cc	2013-06-14 07:11:24 +0000
@@ -92,7 +92,7 @@
   if (not ret)
     ret= &unused;
 
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  if (libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL) == false)
   {
     *ret= MEMCACHED_NOT_SUPPORTED;
     return false;

=== modified file 'libtest/abort.cc'
--- libtest/abort.cc	2012-04-28 05:12:41 +0000
+++ libtest/abort.cc	2013-06-14 07:11:24 +0000
@@ -36,6 +36,8 @@
 
 #include <cstdlib>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 int main(void)
 {
   if (1)
@@ -45,3 +47,4 @@
 
   return 0;
 }
+#pragma GCC diagnostic pop

=== modified file 'libtest/alarm.cc'
--- libtest/alarm.cc	2013-02-11 12:22:44 +0000
+++ libtest/alarm.cc	2013-06-14 07:11:24 +0000
@@ -52,49 +52,57 @@
 
 void set_alarm()
 {
-  if (setitimer(ITIMER_VIRTUAL, &defualt_timer, NULL) == -1)
+  if (gdb_is_caller() == false)
   {
-    Error << "setitimer() failed";
+    if (setitimer(ITIMER_VIRTUAL, &defualt_timer, NULL) == -1)
+    {
+      Error << "setitimer() failed";
+    }
   }
 }
 
 void set_alarm(long tv_sec, long tv_usec)
 {
   // For the moment use any value to YATL_ALARM to cancel alarming.
-  if (getenv("YATL_ALARM"))
+  if (gdb_is_caller() == false)
   {
-    errno= 0;
-    tv_sec= strtol(getenv("YATL_ALARM"), (char **) NULL, 10);
-
-    if (errno != 0)
-    {
-      FATAL("Bad value for YATL_ALARM");
-    }
-    else if (tv_sec == 0)
-    {
-      cancel_alarm();
-    }
-  }
+    if (getenv("YATL_ALARM"))
+    {
+      errno= 0;
+      tv_sec= strtol(getenv("YATL_ALARM"), (char **) NULL, 10);
+      if (errno != 0)
+      {
+        FATAL("Bad value for YATL_ALARM");
+      }
+      else if (tv_sec == 0)
+      {
+        cancel_alarm();
+      }
+    }
 
 #ifdef __APPLE__
-  struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
+    struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
 #else
-  struct timeval it_value= { tv_sec, tv_usec };
+    struct timeval it_value= { tv_sec, tv_usec };
 #endif
 
-  struct itimerval timer= { default_it_interval, it_value };
+    struct itimerval timer= { default_it_interval, it_value };
 
-  if (setitimer(ITIMER_VIRTUAL, &timer, NULL) == -1)
-  {
-    Error << "setitimer() failed";
+    if (setitimer(ITIMER_VIRTUAL, &timer, NULL) == -1)
+    {
+      Error << "setitimer() failed";
+    }
   }
 }
 
 void cancel_alarm()
 {
-  if (setitimer(ITIMER_VIRTUAL, &cancel_timer, NULL) == -1)
+  if (gdb_is_caller() == false)
   {
-    Error << "setitimer() failed";
+    if (setitimer(ITIMER_VIRTUAL, &cancel_timer, NULL) == -1)
+    {
+      Error << "setitimer() failed";
+    }
   }
 }
 

=== modified file 'libtest/client.cc'
--- libtest/client.cc	2013-01-24 11:17:17 +0000
+++ libtest/client.cc	2013-06-14 07:11:24 +0000
@@ -50,16 +50,71 @@
 # define MSG_NOSIGNAL 0
 #endif
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
+
+#define CA_CERT_PEM "/home/brian/cyassl/certs/ca-cert.pem"
+#define CERT_PEM "/home/brian/cyassl/certs/server-cert.pem"
+#define CERT_KEY_PEM "/home/brian/cyassl/certs/server-key.pem"
+
 namespace libtest {
 
 SimpleClient::SimpleClient(const std::string& hostname_, in_port_t port_) :
   _is_connected(false),
+  _is_ssl(false),
   _hostname(hostname_),
   _port(port_),
   sock_fd(INVALID_SOCKET),
-  requested_message(1)
+  _error_file(NULL),
+  _error_line(0),
+  requested_message(1),
+  _ctx_ssl(NULL),
+  _ssl(NULL)
+{
+  init_ssl();
+}
+
+void SimpleClient::init_ssl()
+{
+  if (_is_ssl)
   {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+    CyaSSL_Init();
+
+    if ((_ctx_ssl= CyaSSL_CTX_new(CyaTLSv1_client_method())) == NULL)
+    {
+      FATAL("CyaSSL_CTX_new error" == NULL);
+    }
+
+    if (CyaSSL_CTX_load_verify_locations(_ctx_ssl, CA_CERT_PEM, 0) != SSL_SUCCESS)
+    {
+      FATAL("CyaSSL_CTX_load_verify_locations(%s) cannot obtain certificate", CA_CERT_PEM);
+    }
+
+    if (CyaSSL_CTX_use_certificate_file(_ctx_ssl, CERT_PEM, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    {   
+      FATAL("CyaSSL_CTX_use_certificate_file(%s) cannot obtain certificate", CERT_PEM);
+    }
+
+    if (CyaSSL_CTX_use_PrivateKey_file(_ctx_ssl, CERT_KEY_PEM, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    {   
+      FATAL("CyaSSL_CTX_use_PrivateKey_file(%s) cannot obtain certificate", CERT_KEY_PEM);
+    }
+#endif // defined(HAVE_CYASSL) && HAVE_CYASSL
   }
+}
+
+void SimpleClient::error(const char* file_, int line_, const std::string& error_)
+{
+  _error.clear();
+  _error_file= file_;
+  _error_line= line_;
+  vchar_t buffer;
+  buffer.resize(1024);
+  snprintf(&buffer[0], buffer.size() -1, "%s:%d: %s", file_, line_, error_.c_str());
+  _error.append(&buffer[0]);
+}
 
 bool SimpleClient::ready(int event_)
 {
@@ -78,7 +133,7 @@
 
   if (ready_fds == -1)
   {
-    _error= strerror(errno);
+    error(__FILE__, __LINE__, strerror(errno));
     return false;
   }
   else if (ready_fds == 1)
@@ -94,12 +149,12 @@
         // We check the value to see what happened wth the socket.
         if (err == 0)
         {
-          _error= "getsockopt() returned no error but poll() indicated one existed";
+          error(__FILE__, __LINE__, "getsockopt() returned no error but poll() indicated one existed");
           return false;
         }
         errno= err;
       }
-      _error= strerror(errno);
+      error(__FILE__, __LINE__, strerror(errno));
 
       return false;
     }
@@ -112,14 +167,13 @@
   }
 
   fatal_assert(ready_fds == 0);
-  _error= "TIMEOUT";
+  error(__FILE__, __LINE__, "TIMEOUT");
 
   return false;
 }
 
 struct addrinfo* SimpleClient::lookup()
 {
-  struct addrinfo *ai= NULL;
   struct addrinfo hints;
   memset(&hints, 0, sizeof(struct addrinfo));
   hints.ai_socktype= SOCK_STREAM;
@@ -130,32 +184,42 @@
   (void)snprintf(&service[0], service.size(), "%d", _port);
 
   int getaddrinfo_error;
-  if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), &service[0], &hints, &ai)) != 0)
+  if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), &service[0], &hints, &_ai)) != 0)
   {
     if (getaddrinfo_error != EAI_SYSTEM)
     {
-      _error= gai_strerror(getaddrinfo_error);
+      error(__FILE__, __LINE__, gai_strerror(getaddrinfo_error));
       return NULL;
     }
     else
     {
-      _error= strerror(getaddrinfo_error);
+      error(__FILE__, __LINE__, strerror(getaddrinfo_error));
       return NULL;
     }
   }
 
-  return ai;
+  return _ai;
 }
 
 SimpleClient::~SimpleClient()
 {
+  free_addrinfo();
   close_socket();
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  CyaSSL_CTX_free(_ctx_ssl);
+  _ctx_ssl= NULL;
+#endif
 }
 
 void SimpleClient::close_socket()
 {
   if (sock_fd != INVALID_SOCKET)
   {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+    CyaSSL_shutdown(_ssl); 
+    CyaSSL_free(_ssl); 
+    _ssl= NULL;
+#endif
     close(sock_fd);
     sock_fd= INVALID_SOCKET;
   }
@@ -164,11 +228,10 @@
 bool SimpleClient::instance_connect()
 {
   _is_connected= false;
-  struct addrinfo *ai;
-  if ((ai= lookup()))
+  if (lookup())
   {
     {
-      struct addrinfo* address_info_next= ai;
+      struct addrinfo* address_info_next= _ai;
 
       while (address_info_next and sock_fd == INVALID_SOCKET)
       {
@@ -193,7 +256,11 @@
             }
 
             close_socket();
-            _error= strerror(errno);
+            error(__FILE__, __LINE__, strerror(errno));
+          }
+          else
+          {
+            return true;
           }
         }
         else
@@ -203,12 +270,12 @@
         address_info_next= address_info_next->ai_next;
       }
 
-      freeaddrinfo(ai);
+      free_addrinfo();
     }
 
     if (sock_fd == INVALID_SOCKET)
     {
-      fatal_assert(_error.size());
+      fatal_assert(is_error());
     }
 
     return bool(sock_fd != INVALID_SOCKET);
@@ -222,7 +289,31 @@
   _error.clear();
   if (sock_fd == INVALID_SOCKET)
   {
-    return instance_connect();
+    if (instance_connect())
+    {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+      if (_ctx_ssl)
+      {
+        _ssl= CyaSSL_new(_ctx_ssl);
+        if (_ssl == NULL)
+        {
+          error(__FILE__, __LINE__, "CyaSSL_new failed");
+          return false;
+        }
+
+        int ssl_error;
+        if ((ssl_error= CyaSSL_set_fd(_ssl, sock_fd)) != SSL_SUCCESS)
+        {
+          error(__FILE__, __LINE__, "CyaSSL_set_fd() should not be returning an error.");
+          return false;
+        }
+      }
+#endif
+
+      return true;
+    }
+
+    return false;
   }
 
   return true;
@@ -237,12 +328,40 @@
       off_t offset= 0;
       do
       {
-        ssize_t nw= send(sock_fd, ptr + offset, len - offset, MSG_NOSIGNAL);
+        ssize_t nw;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+        if (_ssl)
+        {
+          nw= CyaSSL_write(_ssl, (const void*)(ptr +offset), int(len -offset));
+          if (nw < 0)
+          {
+            int sendErr= CyaSSL_get_error(_ssl, 0);
+            if (sendErr != SSL_ERROR_WANT_WRITE)
+            {
+              char errorString[80];
+              int err = CyaSSL_get_error(_ssl, 0);
+              CyaSSL_ERR_error_string(err, errorString);
+              error(__FILE__, __LINE__, errorString);
+            }
+            else
+            {
+              error(__FILE__, __LINE__, "SSL_ERROR_WANT_WRITE");
+            }
+
+            return false;
+          }
+        }
+        else
+#endif
+        {
+          nw= send(sock_fd, ptr + offset, len - offset, MSG_NOSIGNAL);
+        }
+
         if (nw == -1)
         {
           if (errno != EINTR)
           {
-            _error= strerror(errno);
+            error(__FILE__, __LINE__, strerror(errno));
             return false;
           }
         }
@@ -256,7 +375,7 @@
     }
   }
 
-  fatal_assert(_error.size());
+  fatal_assert(is_error());
 
   return false;
 }
@@ -306,12 +425,37 @@
       buffer[1]= 0;
       do
       {
-        ssize_t nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
+        ssize_t nr;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+        if (_ssl)
+        {
+          nr= CyaSSL_read(_ssl, buffer, 1);
+          if (_ssl and nr < 0)
+          {
+            int readErr = CyaSSL_get_error(_ssl, 0);
+            if (readErr != SSL_ERROR_WANT_READ)
+            {
+              error(__FILE__, __LINE__, "CyaSSL_read failed");
+            }
+            else
+            {
+              error(__FILE__, __LINE__, "CyaSSL_read (unknown) failed");
+            }
+
+            return false;
+          }
+        }
+        else
+#endif
+        {
+          nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
+        }
+
         if (nr == -1)
         {
           if (errno != EINTR)
           {
-            _error= strerror(errno);
+            error(__FILE__, __LINE__, strerror(errno));
             return false;
           }
         }
@@ -336,7 +480,7 @@
     }
   }
 
-  fatal_assert(_error.size());
+  fatal_assert(is_error());
   return false;
 }
 
@@ -353,12 +497,34 @@
       buffer[1]= 0;
       do
       {
-        ssize_t nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
+        ssize_t nr;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+        if (_ssl)
+        {
+          nr= CyaSSL_read(_ssl, buffer, 1);
+          if (_ssl and nr < 0)
+          {
+            int readErr = CyaSSL_get_error(_ssl, 0);
+            if (readErr != SSL_ERROR_WANT_READ)
+            {
+              error(__FILE__, __LINE__, "CyaSSL_read failed");
+            }
+            else
+            {
+              error(__FILE__, __LINE__, "CyaSSL_read (unknown) failed");
+            }
+
+            return false;
+          }
+        }
+        else
+#endif
+        nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
         if (nr == -1)
         {
           if (errno != EINTR)
           {
-            _error= strerror(errno);
+            error(__FILE__, __LINE__, strerror(errno));
             return false;
           }
         }
@@ -382,7 +548,7 @@
     }
   }
 
-  fatal_assert(_error.size());
+  fatal_assert(is_error());
   return false;
 }
 

=== modified file 'libtest/client.hpp'
--- libtest/client.hpp	2013-01-08 01:03:28 +0000
+++ libtest/client.hpp	2013-06-14 07:11:24 +0000
@@ -36,6 +36,10 @@
 
 #pragma once
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
+
 namespace libtest {
 
 class SimpleClient {
@@ -49,7 +53,9 @@
   bool response(std::string&);
   bool response(libtest::vchar_t&);
 
+private:
   bool is_valid();
+public:
 
   const std::string& error() const
   {
@@ -61,20 +67,45 @@
     return _error.size() ? true : false;
   }
 
+  const char* error_file() const
+  {
+    return _error_file;
+  }
+
+  int error_line() const
+  {
+    return _error_line;
+  }
+
+private:
+  void free_addrinfo()
+  {
+    freeaddrinfo(_ai);
+    _ai= NULL;
+  }
+
 private: // Methods
+  void error(const char* file, int line, const std::string& error_);
   void close_socket();
   bool instance_connect();
   struct addrinfo* lookup();
   bool message(const char* ptr, const size_t len);
   bool ready(int event_);
+  void init_ssl();
 
 private:
   bool _is_connected;
+  bool _is_ssl;
   std::string _hostname;
   in_port_t _port;
   int sock_fd;
   std::string _error;
+  const char* _error_file;
+  int _error_line;
   int requested_message;
+  struct CYASSL_CTX* _ctx_ssl;
+  struct CYASSL* _ssl;
+  struct addrinfo *_ai;
 };
 
 } // namespace libtest

=== modified file 'libtest/cmdline.cc'
--- libtest/cmdline.cc	2013-05-04 09:20:42 +0000
+++ libtest/cmdline.cc	2013-06-14 07:11:24 +0000
@@ -388,28 +388,56 @@
   }
 
   bool data_was_read= false;
-  if (fds[0].revents & POLLRDNORM)
+  if (fds[0].revents)
   {
-    if (stdout_fd.read(_stdout_buffer) == true)
-    {
-      data_was_read= true;
+    if (fds[0].revents & POLLRDNORM)
+    {
+      if (stdout_fd.read(_stdout_buffer) == true)
+      {
+        data_was_read= true;
+      }
+    }
+
+    if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL))
+    {
+      stdout_fd.close();
+
+      if (fds[0].revents & POLLERR)
+      {
+        Error << "getsockopt(stdout)";
+      }
     }
   }
 
-  if (fds[1].revents & POLLRDNORM)
+  if (fds[1].revents)
   {
-    if (stderr_fd.read(_stderr_buffer) == true)
-    {
-      data_was_read= true;
+    if (fds[1].revents & POLLRDNORM)
+    {
+      if (stderr_fd.read(_stderr_buffer) == true)
+      {
+        data_was_read= true;
+      }
+    }
+
+    if (fds[1].revents & (POLLERR | POLLHUP | POLLNVAL))
+    {
+      stderr_fd.close();
+
+      if (fds[1].revents & POLLERR)
+      {
+        Error << "getsockopt(stderr)";
+      }
     }
   }
 
   return data_was_read;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 Application::error_t Application::join()
 {
-  pid_t waited_pid= waitpid(_pid, &_status, WUNTRACED);
+  pid_t waited_pid= waitpid(_pid, &_status, 0);
   slurp();
   if (waited_pid == _pid and WIFEXITED(_status) == false)
   {
@@ -505,6 +533,7 @@
 
   return _app_exit_state;
 }
+#pragma GCC diagnostic pop
 
 void Application::add_long_option(const std::string& name, const std::string& option_value)
 {
@@ -546,6 +575,25 @@
   return _pipe_fd[WRITE]; // STDIN_FILENO
 }
 
+void Application::Pipe::Pipe::close()
+{
+  if (_std_fd == STDOUT_FILENO)
+  {
+    ::close(_pipe_fd[READ]);
+    _pipe_fd[READ]= -1;
+  }
+  else if (_std_fd == STDERR_FILENO)
+  {
+    ::close(_pipe_fd[READ]);
+    _pipe_fd[READ]= -1;
+  }
+  else
+  {
+    ::close(_pipe_fd[WRITE]);
+    _pipe_fd[WRITE]= -1;
+  }
+}
+
 
 bool Application::Pipe::read(libtest::vchar_t& arg)
 {
@@ -596,7 +644,7 @@
   if (flags == -1)
   {
     Error << "fcntl(F_GETFL) " << strerror(errno);
-    throw strerror(errno);
+    throw std::runtime_error(strerror(errno));
   }
 
   int rval;
@@ -608,7 +656,7 @@
   if (rval == -1)
   {
     Error << "fcntl(F_SETFL) " << strerror(errno);
-    throw strerror(errno);
+    throw std::runtime_error(strerror(errno));
   }
 }
 
@@ -649,7 +697,7 @@
       if (flags == -1)
       {
         Error << "fcntl(F_GETFD) " << strerror(errno);
-        throw strerror(errno);
+        throw std::runtime_error(strerror(errno));
       }
 
       int rval;
@@ -661,7 +709,7 @@
       if (rval == -1)
       {
         Error << "fcntl(F_SETFD) " << strerror(errno);
-        throw strerror(errno);
+        throw std::runtime_error(strerror(errno));
       }
     }
   }
@@ -731,13 +779,26 @@
     vchar::append(built_argv, "--leak-check=yes");
 #if 0
     vchar::append(built_argv, "--show-reachable=yes"));
-#endif
     vchar::append(built_argv, "--track-fds=yes");
+#endif
 #if 0
     built_argv[x++]= strdup("--track-origin=yes");
 #endif
     vchar::append(built_argv, "--malloc-fill=A5");
     vchar::append(built_argv, "--free-fill=DE");
+    vchar::append(built_argv, "--xml=yes");
+    if (getenv("VALGRIND_HOME"))
+    {
+      libtest::vchar_t buffer;
+      buffer.resize(1024);
+      int length= snprintf(&buffer[0], buffer.size(), "--xml-file=%s/cmd-%%p.xml", getenv("VALGRIND_HOME"));
+      fatal_assert(length > 0 and size_t(length) < buffer.size());
+      vchar::append(built_argv, &buffer[0]);
+    }
+    else
+    {
+      vchar::append(built_argv, "--xml-file=valgrind-cmd-%p.xml");
+    }
 
     std::string log_file= create_tmpfile("valgrind");
     libtest::vchar_t buffer;

=== modified file 'libtest/cmdline.h'
--- libtest/cmdline.h	2013-04-20 05:43:10 +0000
+++ libtest/cmdline.h	2013-06-14 07:11:24 +0000
@@ -109,6 +109,7 @@
     ~Pipe();
 
     int fd();
+    void close();
 
     enum close_t {
       READ= 0,

=== modified file 'libtest/collection.cc'
--- libtest/collection.cc	2013-05-03 07:36:06 +0000
+++ libtest/collection.cc	2013-06-14 07:11:24 +0000
@@ -60,6 +60,7 @@
   // system.
   catch (const libtest::fatal& e)
   {
+    alarm(0);
     if (libtest::fatal::is_disabled())
     {
       libtest::fatal::increment_disabled_counter();
@@ -70,6 +71,11 @@
       throw;
     }
   }
+  catch (...)
+  {
+    alarm(0);
+    throw;
+  }
 
   _timer.sample();
 

=== modified file 'libtest/cpu.cc'
--- libtest/cpu.cc	2012-12-09 11:40:11 +0000
+++ libtest/cpu.cc	2013-06-14 07:11:24 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -34,8 +34,11 @@
  *
  */
 
-#include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#ifdef HAVE_CONFIG_H
+# include "libtest/yatlcon.h"
+#endif
+
+#include "libtest/cpu.hpp"
 
 #include <unistd.h>
 
@@ -47,23 +50,21 @@
 
 namespace libtest {
 
-size_t number_of_cpus()
+uint32_t number_of_cpus()
 {
-  size_t number_of_cpu= 1;
-#if defined(TARGET_OS_LINUX) && TARGET_OS_LINUX
+  uint32_t number_of_cpu= 1;
+#ifdef linux 
   number_of_cpu= sysconf(_SC_NPROCESSORS_ONLN);
 #elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_HW) && defined(HW_NCPU) && defined(HW_AVAILCPU) && defined(HW_NCPU)
   int mib[4];
   size_t len= sizeof(number_of_cpu); 
 
   /* set the mib for hw.ncpu */
-  mib[0] = CTL_HW;
-  mib[1] = HW_AVAILCPU;  // alternatively, try HW_NCPU;
+  mib[0]= CTL_HW;
+  mib[1]= HW_AVAILCPU;  // alternatively, try HW_NCPU;
 
   /* get the number of CPUs from the system */
-  sysctl(mib, 2, &number_of_cpu, &len, NULL, 0);
-
-  if (number_of_cpu < 1) 
+  if (sysctl(mib, 2, &number_of_cpu, &len, NULL, 0) == -1)
   {
     mib[1]= HW_NCPU;
     sysctl(mib, 2, &number_of_cpu, &len, NULL, 0 );

=== modified file 'libtest/cpu.hpp'
--- libtest/cpu.hpp	2012-04-28 05:12:41 +0000
+++ libtest/cpu.hpp	2013-06-14 07:11:24 +0000
@@ -36,8 +36,10 @@
 
 #pragma once
 
+#include <cstdlib>
+
 namespace libtest {
 
-size_t number_of_cpus();
+uint32_t number_of_cpus();
 
 } // namespace libtest

=== modified file 'libtest/drizzled.cc'
--- libtest/drizzled.cc	2013-04-15 19:02:09 +0000
+++ libtest/drizzled.cc	2013-06-14 07:11:24 +0000
@@ -166,6 +166,11 @@
     return true;
   }
 
+  bool is_valgrind() const
+  {
+    return false;
+  }
+
   bool has_port_option() const
   {
     return true;

=== modified file 'libtest/error.h'
--- libtest/error.h	2012-04-28 05:12:41 +0000
+++ libtest/error.h	2013-06-14 07:11:24 +0000
@@ -52,3 +52,77 @@
 {
   return (rc != TEST_SUCCESS);
 }
+
+namespace libtest {
+
+class Error
+{
+  public:
+    Error():
+      _is_error(false),
+      _file(NULL),
+      _line(-1),
+      _func(NULL)
+    {
+    }
+
+    Error(const Error& error_):
+      _is_error(false),
+      _file(NULL),
+      _line(0),
+      _func(NULL)
+    {
+      if (error_.is_error())
+      {
+        _is_error= true;
+        _file= error_.file();
+        _line= error_.line();
+        _func= error_.func();
+        _message= error_.error();
+      }
+    }
+
+    Error(const char* file_, int line_, const char* func_, const std::string& message_):
+      _is_error(true),
+      _file(file_),
+      _line(line_),
+      _func(func_),
+      _message(message_)
+    {
+    }
+
+    bool is_error() const
+    {
+      return _is_error;
+    }
+
+    const char* func() const
+    {
+      return _func;
+    }
+
+    const char* file() const
+    {
+      return _file;
+    }
+
+    int line() const
+    {
+      return _line;
+    }
+
+    const std::string& error() const
+    {
+      return _message;
+    }
+
+  private:
+    bool _is_error;
+    const char* _file;
+    int _line;
+    const char* _func;
+    std::string _message;
+};
+
+} // namespace libtest
+

=== modified file 'libtest/framework.cc'
--- libtest/framework.cc	2013-05-03 07:36:06 +0000
+++ libtest/framework.cc	2013-06-14 07:11:24 +0000
@@ -39,10 +39,69 @@
 #include <libtest/common.h>
 #include <libtest/collection.h>
 #include <libtest/signal.h>
+#include <libtest/stream.h>
 
 #include <algorithm>
+#include <cerrno>
 #include <fnmatch.h>
 #include <iostream>
+#include <set>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+namespace {
+#if defined(DEBUG) && DEBUG
+  int open_file_descriptors(std::set<int>& pre_existing_fd, const bool report)
+  {
+    int max= getdtablesize();
+
+    int counter= 0;
+
+    for (int x= 3; x < max; ++x)
+    {
+      struct stat stats;
+
+      if (fstat(x, &stats) == 0)
+      {
+        if (report)
+        {
+          std::set<int>::iterator it= pre_existing_fd.find(x);
+          if (it!= pre_existing_fd.end())
+          { }
+          else
+          {
+            std::cerr << "FD: " << x;
+
+            if (S_ISREG(stats.st_mode))
+            {
+              std::cerr << " regular file ";
+            }
+            else if (S_ISDIR(stats.st_mode))
+            {
+              std::cerr << " directory ";
+            }
+            else if (S_ISSOCK(stats.st_mode))
+            {
+              std::cerr << " socket ";
+            }
+
+            std::cerr << std::endl;
+          }
+        }
+        else
+        {
+          pre_existing_fd.insert(x);
+        }
+
+        ++counter;
+      }
+    }
+
+    return counter;
+  }
+#endif // #if defined(DEBUG) && DEBUG
+} // namespace
 
 namespace libtest {
 
@@ -107,54 +166,70 @@
        iter != _collection.end() and (_signal.is_shutdown() == false);
        ++iter)
   {
-    if (*iter)
-    {
-      if (_only_run.empty() == false and
-          fnmatch(_only_run.c_str(), (*iter)->name(), 0))
-      {
-        continue;
-      }
-
-      _total++;
-
-      try {
-        switch ((*iter)->exec())
-        {
-          case TEST_FAILURE:
-            _failed++;
-            break;
-
-          case TEST_SKIPPED:
-            _skipped++;
-            break;
-
-            // exec() can return SUCCESS, but that doesn't mean that some tests did
-            // not fail or get skipped.
-          case TEST_SUCCESS:
-            _success++;
-            break;
-        }
-      }
-      catch (const libtest::fatal& e)
-      {
-        _failed++;
-        stream::cerr(e.file(), e.line(), e.func()) << e.what();
-      }
-      catch (const libtest::disconnected& e)
-      {
-        _failed++;
-        Error << "Unhandled disconnection occurred:" << e.what();
-        throw;
-      }
-      catch (...)
-      {
-        _failed++;
-        throw;
-      }
-    }
+    if (_only_run.empty() == false and
+        fnmatch(_only_run.c_str(), (*iter)->name(), 0))
+    {
+      continue;
+    }
+
+    _total++;
+
+#if defined(DEBUG) && DEBUG
+    std::set<int> pre_existing_fd;
+    int open_fd= 0;
+    if (DEBUG)
+    {
+      open_fd= open_file_descriptors(pre_existing_fd, false);
+    }
+#endif
+
+    try {
+      switch ((*iter)->exec())
+      {
+      case TEST_FAILURE:
+        _failed++;
+        break;
+
+      case TEST_SKIPPED:
+        _skipped++;
+        break;
+
+        // exec() can return SUCCESS, but that doesn't mean that some tests did
+        // not fail or get skipped.
+      case TEST_SUCCESS:
+        _success++;
+        break;
+      }
+    }
+    catch (const libtest::fatal& e)
+    {
+      _failed++;
+      stream::cerr(e.file(), e.line(), e.func()) << e.what();
+    }
+    catch (const libtest::disconnected& e)
+    {
+      _failed++;
+      Error << "Unhandled disconnection occurred:" << e.what();
+      throw;
+    }
+    catch (...)
+    {
+      _failed++;
+      throw;
+    }
+
+#if defined(DEBUG) && DEBUG
+    if (DEBUG)
+    {
+      int now_open_fd= open_file_descriptors(pre_existing_fd, true);
+
+      if (open_fd != now_open_fd)
+      {
+        Error << "Growing number of file descriptors: " << int(now_open_fd - open_fd);
+      }
+    }
+#endif
   }
-
-  void xml(const std::string& testsuites_name, std::ostream& output);
 }
 
 uint32_t Framework::sum_total()

=== modified file 'libtest/gearmand.cc'
--- libtest/gearmand.cc	2013-01-24 11:17:17 +0000
+++ libtest/gearmand.cc	2013-06-14 07:11:24 +0000
@@ -79,9 +79,14 @@
     std::string response;
     bool ret= client.send_message("version", response);
 
+    if (ret == false)
+    {
+      ASSERT_TRUE_(client.is_error(), "client.send_message() failed but no error was set");
+    }
+
     if (client.is_error())
     {
-      error(client.error());
+      error(client.error_file(), client.error_line(), client.error());
     }
 
     return ret;
@@ -141,6 +146,12 @@
 
   add_option("--listen=localhost");
 
+
+  if (is_ssl())
+  {
+    add_option("--ssl");
+  }
+
   return true;
 }
 

=== modified file 'libtest/has.cc'
--- libtest/has.cc	2013-05-03 07:36:06 +0000
+++ libtest/has.cc	2013-06-14 07:11:24 +0000
@@ -43,11 +43,8 @@
 
 namespace libtest {
 
-bool has_libmemcached_sasl(void)
-{
-  return false;
-}
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool has_libmemcached(void)
 {
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
@@ -59,6 +56,7 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
 bool has_libdrizzle(void)
 {
@@ -72,6 +70,8 @@
   return false;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool has_postgres_support(void)
 {
   char *getenv_ptr;
@@ -86,6 +86,7 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
 
 bool has_gearmand()

=== modified file 'libtest/http.cc'
--- libtest/http.cc	2013-05-03 07:36:06 +0000
+++ libtest/http.cc	2013-06-14 07:11:24 +0000
@@ -114,6 +114,8 @@
   initialize_curl();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool GET::execute()
 {
   (void)init;
@@ -139,7 +141,10 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool POST::execute()
 {
 #if defined(HAVE_LIBCURL) && HAVE_LIBCURL
@@ -163,7 +168,10 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool TRACE::execute()
 {
 #if defined(HAVE_LIBCURL) && HAVE_LIBCURL
@@ -188,7 +196,10 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool HEAD::execute()
 {
 #if defined(HAVE_LIBCURL) && HAVE_LIBCURL
@@ -212,6 +223,7 @@
 
   return false;
 }
+#pragma GCC diagnostic pop
 
 } // namespace http
 } // namespace libtest

=== modified file 'libtest/include.am'
--- libtest/include.am	2013-05-03 07:36:06 +0000
+++ libtest/include.am	2013-06-14 07:11:24 +0000
@@ -115,6 +115,9 @@
 EXTRA_libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
+libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@
+libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@
+libtest_libtest_la_LIBADD+= @CYASSL_LIB@
 
 libtest_libtest_la_SOURCES+= libtest/alarm.cc
 libtest_libtest_la_SOURCES+= libtest/binaries.cc

=== modified file 'libtest/is_local.cc'
--- libtest/is_local.cc	2012-12-09 11:40:11 +0000
+++ libtest/is_local.cc	2013-06-14 07:11:24 +0000
@@ -56,5 +56,16 @@
   return _is_massive;
 }
 
+static bool _is_ssl= false;
+void is_ssl(bool arg)
+{
+  _is_ssl= arg;
+}
+
+bool is_ssl()
+{
+  return _is_ssl;
+}
+
 } // namespace libtest
 

=== modified file 'libtest/is_local.hpp'
--- libtest/is_local.hpp	2012-07-15 06:35:11 +0000
+++ libtest/is_local.hpp	2013-06-14 07:11:24 +0000
@@ -47,4 +47,10 @@
 LIBTEST_API
 bool is_massive();
 
+LIBTEST_API
+void is_ssl(bool);
+
+LIBTEST_API
+bool is_ssl();
+
 } // namespace libtest

=== modified file 'libtest/lite.h'
--- libtest/lite.h	2013-04-21 08:19:20 +0000
+++ libtest/lite.h	2013-06-14 07:11:24 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -192,6 +192,18 @@
   } \
 } while (0)
 
+#define ASSERT_NULL(__expression) \
+do \
+{ \
+  if ((__expression) != NULL) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' != NULL", #__expression);\
+    } \
+    fprintf(stderr, "\n%s:%d: %s Assertion '%s' != NULL\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression);\
+    exit(EXIT_FAILURE); \
+  } \
+} while (0)
+
 #define ASSERT_NULL_(__expression, ...) \
 do \
 { \
@@ -213,9 +225,9 @@
 { \
   if ((__expression) == NULL) { \
     if (YATL_FULL) { \
-      FAIL("Assertion '%s' == NULL", #__expression,);\
+      FAIL("Assertion '%s' == NULL", #__expression);\
     } \
-    fprintf(stderr, "\n%s:%d: %s Assertion '%s' == NULL\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression,);\
+    fprintf(stderr, "\n%s:%d: %s Assertion '%s' == NULL\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression);\
     exit(EXIT_FAILURE); \
   } \
 } while (0)
@@ -285,8 +297,8 @@
 { \
   size_t __expected_length; \
   size_t __actual_length; \
-  int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
-  if (ret) { \
+  int __ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
+  if (__ret) { \
     if (YATL_FULL) { \
       FAIL("Assertion '%.*s' != '%.*s'\n", \
            (int)(__expected_length), (__expected_str), \
@@ -304,8 +316,8 @@
 { \
   size_t __expected_length; \
   size_t __actual_length; \
-  int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
-  if (ret) { \
+  int __ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
+  if (__ret) { \
     size_t ask= snprintf(0, 0, __VA_ARGS__); \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
@@ -329,8 +341,8 @@
 { \
   size_t __expected_length; \
   size_t __actual_length; \
-  int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
-  if (ret == 0) { \
+  int __ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
+  if (__ret == 0) { \
     if (YATL_FULL) { \
       FAIL("Assertion '%.*s' == '%.*s'", \
            (int)(__expected_length), (__expected_str), \
@@ -348,8 +360,8 @@
 { \
   size_t __expected_length; \
   size_t __actual_length; \
-  int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
-  if (ret == 0) { \
+  int __ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
+  if (__ret == 0) { \
     size_t ask= snprintf(0, 0, __VA_ARGS__); \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \

=== modified file 'libtest/main.cc'
--- libtest/main.cc	2013-04-29 15:24:05 +0000
+++ libtest/main.cc	2013-06-14 07:11:24 +0000
@@ -38,12 +38,13 @@
 #include <libtest/common.h>
 
 #include <cassert>
+#include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 #include <fnmatch.h>
+#include <fstream>
 #include <iostream>
-#include <fstream>
 #include <memory>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -81,10 +82,12 @@
 #include <getopt.h>
 #include <unistd.h>
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char* environ_[])
 {
   bool opt_massive= false;
+  bool opt_ssl= false;
   unsigned long int opt_repeat= 1; // Run all tests once
+  bool opt_verbose= false;
   bool opt_quiet= false;
   std::string collection_to_run;
   std::string wildcard;
@@ -120,22 +123,27 @@
   // Options parsing
   {
     enum long_option_t {
+      OPT_LIBYATL_VERBOSE,
       OPT_LIBYATL_VERSION,
       OPT_LIBYATL_MATCH_COLLECTION,
       OPT_LIBYATL_MASSIVE,
       OPT_LIBYATL_QUIET,
       OPT_LIBYATL_MATCH_WILDCARD,
-      OPT_LIBYATL_REPEAT
+      OPT_LIBYATL_REPEAT,
+      OPT_LIBYATL_SSL,
+      OPT_LIBYATL_MAX
     };
 
     static struct option long_options[]=
     {
+      { "verbose", no_argument, NULL, OPT_LIBYATL_VERBOSE },
       { "version", no_argument, NULL, OPT_LIBYATL_VERSION },
       { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET },
       { "repeat", required_argument, NULL, OPT_LIBYATL_REPEAT },
       { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION },
       { "wildcard", required_argument, NULL, OPT_LIBYATL_MATCH_WILDCARD },
       { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE },
+      { "ssl", no_argument, NULL, OPT_LIBYATL_SSL },
       { 0, 0, 0, 0 }
     };
 
@@ -150,6 +158,10 @@
 
       switch (option_rv)
       {
+      case OPT_LIBYATL_VERBOSE:
+        opt_verbose= true;
+        break;
+
       case OPT_LIBYATL_VERSION:
         break;
 
@@ -175,6 +187,10 @@
         wildcard= optarg;
         break;
 
+      case OPT_LIBYATL_SSL:
+        opt_ssl= true;
+        break;
+
       case OPT_LIBYATL_MASSIVE:
         opt_massive= true;
         break;
@@ -190,6 +206,14 @@
     }
   }
 
+  if (opt_verbose)
+  {
+    for (char** ptr= environ_; *ptr; ptr++)
+    {
+      Out << *ptr;
+    }
+  }
+
   srandom((unsigned int)time(NULL));
 
   errno= 0;
@@ -218,16 +242,31 @@
     }
   }
 
+  if ((bool(getenv("YATL_WILDCARD"))))
+  {
+    wildcard= getenv("YATL_WILDCARD");
+  }
+
   if ((bool(getenv("YATL_RUN_MASSIVE_TESTS"))) or opt_massive)
   {
     opt_massive= true;
   }
 
+  if ((bool(getenv("YATL_SSL"))) or opt_ssl)
+  {
+    opt_ssl= true;
+  }
+
   if (opt_quiet)
   {
     close(STDOUT_FILENO);
   }
 
+  if (opt_ssl)
+  {
+    is_ssl(opt_ssl);
+  }
+
   if (opt_massive)
   {
     is_massive(opt_massive);
@@ -345,7 +384,11 @@
 
       std::ofstream xml_file;
       std::string file_name;
-      file_name.append(&tmp_directory[0]);
+      if (getenv("WORKSPACE"))
+      {
+        file_name.append(getenv("WORKSPACE"));
+        file_name.append("/");
+      }
       file_name.append(frame->name());
       file_name.append(".xml");
       xml_file.open(file_name.c_str(), std::ios::trunc);

=== modified file 'libtest/memcached.cc'
--- libtest/memcached.cc	2013-04-20 09:55:24 +0000
+++ libtest/memcached.cc	2013-06-14 07:11:24 +0000
@@ -38,9 +38,6 @@
 
 #include "libtest/common.h"
 
-#include <libmemcached-1.2/memcached.h>
-#include <libmemcachedutil-1.2/util.h>
-
 #include <cassert>
 #include <cerrno>
 #include <cstdio>
@@ -185,6 +182,11 @@
     return true;
   }
 
+  bool is_valgrind() const
+  {
+    return false;
+  }
+
   // Memcached's pidfile is broken
   bool broken_pid_file()
   {

=== modified file 'libtest/result.hpp'
--- libtest/result.hpp	2013-04-21 01:17:49 +0000
+++ libtest/result.hpp	2013-06-14 07:11:24 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are

=== modified file 'libtest/server.cc'
--- libtest/server.cc	2013-01-24 11:17:17 +0000
+++ libtest/server.cc	2013-06-14 07:11:24 +0000
@@ -131,6 +131,7 @@
 {
   _app.slurp();
   _app.check();
+
   return true;
 }
 
@@ -194,7 +195,13 @@
   return (_app.pid() > 1);
 }
 
+bool Server::is_valgrind() const
+{
+  return getenv("YATL_VALGRIND_SERVER") or valgrind_is_caller();
+}
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 bool Server::start()
 {
   // If we find that we already have a pid then kill it.
@@ -220,7 +227,7 @@
   {
     _app.use_ptrcheck(true);
   }
-  else if (getenv("YATL_VALGRIND_SERVER"))
+  else if (is_valgrind())
   {
     _app.use_valgrind(true);
   }
@@ -321,18 +328,20 @@
       _app.slurp();
       if (kill_file(pid_file()) == false)
       {
-        throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
+        throw libtest::disconnected(error_file(), error_line(), __PRETTY_FUNCTION__,
                                     hostname(), port(),
-                                    "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s",
+                                    "ping(%s) additionally failed to kill off server, waited: %u after startup occurred failed: %.*s error:%s stderr:%.*s",
+                                    error().c_str(),
                                     this_wait,
                                     int(_running.size()), _running.c_str(),
                                     int(_app.stderr_result_length()), _app.stderr_c_str());
       }
       else
       {
-        throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, 
+        throw libtest::disconnected(error_file(), error_line(), __PRETTY_FUNCTION__,
                                     hostname(), port(),
-                                    "Failed native ping(), pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s",
+                                    "ping(%s) additionally failed pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s",
+                                    error().c_str(),
                                     int(_app.pid()),
                                     _app.check() ? "true" : "false",
                                     this_wait,
@@ -342,9 +351,10 @@
     }
     else
     {
-      throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
+      throw libtest::disconnected(error_file(), error_line(), __PRETTY_FUNCTION__,
                                   hostname(), port(),
-                                  "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s",
+                                  "ping(%s), additionally pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s",
+                                  error().c_str(),
                                   int(_app.pid()),
                                   _app.check() ? "true" : "false",
                                   this_wait,
@@ -358,6 +368,7 @@
 
   return has_pid();
 }
+#pragma GCC diagnostic pop
 
 void Server::reset_pid()
 {

=== modified file 'libtest/server.h'
--- libtest/server.h	2013-01-24 11:17:17 +0000
+++ libtest/server.h	2013-06-14 07:11:24 +0000
@@ -219,6 +219,23 @@
     return _error;
   }
 
+  void error(const char* file_, int line_, const std::string& error_)
+  {
+    _error_file= file_;
+    _error_line= line_;
+    _error= error_;
+  }
+
+  const char* error_file() const
+  {
+    return _error_file;
+  }
+
+  int error_line() const
+  {
+    return _error_line;
+  }
+
   void error(std::string arg)
   {
     _error= arg;
@@ -278,7 +295,7 @@
 
 private:
   bool is_helgrind() const;
-  bool is_valgrind() const;
+  virtual bool is_valgrind() const;
   bool is_debug() const;
   bool set_log_file();
   bool set_socket_file();
@@ -287,6 +304,8 @@
   bool args(Application&);
 
   std::string _error;
+  const char* _error_file;
+  int _error_line;
   uint32_t _timeout; // This number should be high enough for valgrind startup (which is slow)
 };
 

=== modified file 'libtest/signal.cc'
--- libtest/signal.cc	2013-04-15 19:02:09 +0000
+++ libtest/signal.cc	2013-06-14 07:11:24 +0000
@@ -88,7 +88,8 @@
 
 void SignalThread::test()
 {
-  assert(magic_memory == MAGIC_MEMORY);
+  fatal_assert(magic_memory == MAGIC_MEMORY);
+
   if (bool(getenv("LIBTEST_IN_GDB")) == false)
   {
     assert(sigismember(&set, SIGALRM));

=== modified file 'libtest/string.hpp'
--- libtest/string.hpp	2012-04-28 05:12:41 +0000
+++ libtest/string.hpp	2013-06-14 07:11:24 +0000
@@ -40,6 +40,7 @@
 
 #define test_literal_param util_literal_param
 #define test_literal_compare_param util_literal_compare_param
+#define test_literal_printf_param util_literal_printf_param
 #define test_literal_param_size util_literal_param_size
 #define test_string_make_from_cstr util_string_make_from_cstr
 #define test_string_make_from_array util_string_make_from_array

=== modified file 'libtest/unittest.cc'
--- libtest/unittest.cc	2013-05-03 07:36:06 +0000
+++ libtest/unittest.cc	2013-06-14 07:11:24 +0000
@@ -80,6 +80,19 @@
   return TEST_SUCCESS;
 }
 
+static test_return_t VALGRIND_CHECK_TEST(void *)
+{
+  SKIP_IF(bool(getenv("VALGRIND_COMMAND")) == false);
+  SKIP_IF(bool(getenv("TESTS_ENVIRONMENT")) == false);
+
+  if (getenv("TESTS_ENVIRONMENT")  && strstr(getenv("TESTS_ENVIRONMENT"), "valgrind"))
+  {
+    ASSERT_TRUE(valgrind_is_caller());
+  }
+
+  return TEST_SUCCESS;
+}
+
 static test_return_t HELGRIND_COMMAND_test(void *)
 {
   test_true(getenv("HELGRIND_COMMAND"));
@@ -106,6 +119,8 @@
   return TEST_SUCCESS;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 static test_return_t test_throw_success_TEST(void *)
 {
   try {
@@ -122,6 +137,7 @@
 
   return TEST_FAILURE;
 }
+#pragma GCC diagnostic pop
 
 static test_return_t test_throw_skip_macro_TEST(void *)
 {
@@ -198,10 +214,10 @@
 
   return TEST_FAILURE;
 }
+
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstack-protector"
-
 #ifdef __clang__
-# pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wformat-security"
 #endif
 
@@ -222,10 +238,25 @@
 
   return TEST_FAILURE;
 }
-
-#ifdef __clang__
-# pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
+
+static test_return_t ASSERT_NOT_NULL_FAIL_TEST(void *)
+{
+  const char *valid_ptr= NULL;
+  try {
+    ASSERT_NOT_NULL(valid_ptr);
+  }
+  catch (const libtest::__failure& e)
+  {
+    return TEST_SUCCESS;
+  }
+  catch (...)
+  {
+    return TEST_FAILURE;
+  }
+
+  return TEST_FAILURE;
+}
 
 static test_return_t ASSERT_NEQ_FAIL_TEST(void *)
 {
@@ -272,10 +303,14 @@
 
 static test_return_t test_failure_test(void *)
 {
-  return TEST_SKIPPED; // Only run this when debugging
-
-  ASSERT_EQ(1, 2);
-  return TEST_SUCCESS;
+  try {
+    ASSERT_EQ(1, 2);
+  }
+  catch (...)
+  {
+    return TEST_SUCCESS;
+  }
+  return TEST_FAILURE;
 }
 
 static test_return_t local_test(void *)
@@ -296,6 +331,7 @@
 {
   return TEST_SKIPPED;
 
+#if 0
   std::string temp;
 
   const char *ptr;
@@ -323,6 +359,7 @@
   }
 
   return TEST_SUCCESS;
+#endif
 }
 
 static test_return_t var_exists_test(void *)
@@ -618,7 +655,7 @@
   true_app.will_fail();
 
   const char *args[]= { "--fubar", 0 };
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#if defined(__APPLE__) && __APPLE__
   ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
 #elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
   ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
@@ -878,8 +915,6 @@
 {
   ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
   throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Testing va_args based fatal(): %d", 10); 
-
-  return TEST_SUCCESS;
 }
 
 static test_return_t number_of_cpus_TEST(void *)
@@ -966,6 +1001,8 @@
   return TEST_SUCCESS;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 static test_return_t check_for_gearman(void *)
 {
   test_skip(true, HAVE_LIBGEARMAN);
@@ -988,9 +1025,14 @@
 
   return TEST_SUCCESS;
 }
+#pragma GCC diagnostic pop
 
 static test_return_t check_for_drizzle(void *)
 {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  SKIP_IF(HAVE_CYASSL);
+#endif
+
   test_skip(true, has_drizzled());
 
   testing_service= "drizzled";
@@ -1027,6 +1069,10 @@
 
 static test_return_t check_for_memcached(void* object)
 {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  SKIP_IF(HAVE_CYASSL);
+#endif
+
   test_skip(true, has_memcached());
 
   server_startup_st *servers= (server_startup_st*)object;
@@ -1058,6 +1104,7 @@
   {"VALGRIND_COMMAND", 0, VALGRIND_COMMAND_test },
   {"HELGRIND_COMMAND", 0, HELGRIND_COMMAND_test },
   {"GDB_COMMAND", 0, GDB_COMMAND_test },
+  {"valgrind_is_caller()", 0, VALGRIND_CHECK_TEST },
   {0, 0, 0}
 };
 
@@ -1074,6 +1121,7 @@
   {"ASSERT_FALSE", false, ASSERT_FALSE_TEST },
   {"ASSERT_NEQ", false, ASSERT_NEQ_TEST },
   {"ASSERT_NEQ FAIL", false, ASSERT_NEQ_FAIL_TEST },
+  {"ASSERT_NOT_NULL FAIL", false, ASSERT_NOT_NULL_FAIL_TEST },
   {0, 0, 0}
 };
 

=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-04-29 14:58:26 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-06-14 07:11:24 +0000
@@ -197,7 +197,7 @@
           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
           _APPEND_COMPILE_FLAGS_ERROR([-Wpacked])
 #         _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long])
-          _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
+#         _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
 
           AS_IF([test "x$ax_enable_debug" = xno],
             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],

=== modified file 'm4/ax_prog_sphinx_build.m4'
--- m4/ax_prog_sphinx_build.m4	2013-04-29 10:38:15 +0000
+++ m4/ax_prog_sphinx_build.m4	2013-06-14 07:11:24 +0000
@@ -19,26 +19,29 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 3
+#serial 4
 
 AC_DEFUN([AX_PROG_SPHINX_BUILD],
-    [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:])
-    AS_IF([test x"SPHINXBUILD" = x":"],
-      [SPHINXBUILD=],
-      [AS_IF([test -x "$SPHINXBUILD"],
-        [AC_MSG_CHECKING([Checking to see if $SPHINXBUILD is recent])
-        junk=`$SPHINXBUILD &> version_file`
-        ax_sphinx_build_version=`head -1 version_file`
-        rm version_file
-        AC_MSG_RESULT([$SPHINXBUILD is version "$ax_sphinx_build_version"])
-        $SPHINXBUILD -Q -C -b man -d conftest.d . . >/dev/null 2>&1
-        AS_IF([test $? -eq 0], ,[SPHINXBUILD=])
-        rm -rf conftest.d
-        ])
-      ])
+         [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:])
+         AS_IF([test x"SPHINXBUILD" = x":"],
+               [SPHINXBUILD=],
+               [AS_IF([test -x "$SPHINXBUILD"],
+                      [AC_MSG_CHECKING([Checking to see if $SPHINXBUILD is recent])
+                      junk=`$SPHINXBUILD --version &> version_file`
+                      AS_IF([test $? -eq 0],
+                            [ax_sphinx_build_version=`head -1 version_file`],
+                            [junk=`$SPHINXBUILD &> version_file`
+                            ax_sphinx_build_version=`head -1 version_file`
+                            rm version_file
+                            AC_MSG_RESULT([$SPHINXBUILD is version "$ax_sphinx_build_version"])
+                            $SPHINXBUILD -Q -C -b man -d conftest.d . . >/dev/null 2>&1
+                            AS_IF([test $? -eq 0], ,[SPHINXBUILD=])
+                            rm -rf conftest.d ])
+                      ])
+               ])
 
-    AS_IF([test -n "${SPHINXBUILD}"],
-      [AC_SUBST([SPHINXBUILD])
-      ifelse([$1], , :, [$1])],
-      [ifelse([$2], , :, [$2])])
-    ])
+         AS_IF([test -n "${SPHINXBUILD}"],
+               [AC_SUBST([SPHINXBUILD])
+               ifelse([$1], , :, [$1])],
+               [ifelse([$2], , :, [$2])])
+         ])

=== modified file 'rpm/include.am'
--- rpm/include.am	2012-12-04 23:19:34 +0000
+++ rpm/include.am	2013-06-14 07:11:24 +0000
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-rpm-build: support/$(PACKAGE).spec distcheck
+rpm-build: support/$(PACKAGE).spec dist
 	@rm -f *.rpm
 	@rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm
 	@rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm

=== modified file 'support/libmemcached.spec.in'
--- support/libmemcached.spec.in	2013-04-03 13:14:23 +0000
+++ support/libmemcached.spec.in	2013-06-14 07:11:24 +0000
@@ -174,6 +174,7 @@
 %{_includedir}/libmemcached-1.2/error.h
 %{_includedir}/libmemcached-1.2/exception.hpp
 %{_includedir}/libmemcached-1.2/exist.h
+%{_includedir}/libmemcached-1.2/feature.h
 %{_includedir}/libmemcached-1.2/fetch.h
 %{_includedir}/libmemcached-1.2/flush.h
 %{_includedir}/libmemcached-1.2/flush_buffers.h

=== modified file 'tests/keys.hpp'
--- tests/keys.hpp	2013-04-19 06:26:06 +0000
+++ tests/keys.hpp	2013-06-14 07:11:24 +0000
@@ -39,6 +39,8 @@
 #include <uuid/uuid.h>
 #endif
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 struct keys_st {
 public:
   keys_st(size_t arg)
@@ -143,3 +145,4 @@
     libtest::vchar_ptr_t _keys;
     std::vector<size_t> _lengths;
 };
+#pragma GCC diagnostic pop

=== modified file 'tests/libmemcached-1.0/all_tests.cc'
--- tests/libmemcached-1.0/all_tests.cc	2012-10-29 00:38:35 +0000
+++ tests/libmemcached-1.0/all_tests.cc	2013-06-14 07:11:24 +0000
@@ -83,7 +83,7 @@
   {
     // Assume a minimum of 3, and a maximum of 8
     world->servers().set_servers_to_run((libtest::number_of_cpus() > 3) ? 
-                                        std::min(libtest::number_of_cpus(), size_t(8)) : 3);
+                                        std::min(libtest::number_of_cpus(), uint32_t(8)) : 3);
   }
 
   world->collections(collection);

=== modified file 'tests/libmemcached-1.0/generate.cc'
--- tests/libmemcached-1.0/generate.cc	2013-04-03 13:14:23 +0000
+++ tests/libmemcached-1.0/generate.cc	2013-06-14 07:11:24 +0000
@@ -113,6 +113,8 @@
   return TEST_SUCCESS;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 test_return_t generate_data_with_stats(memcached_st *memc)
 {
   test_compare(TEST_SUCCESS, generate_pairs(memc));
@@ -147,6 +149,7 @@
 
   return TEST_SUCCESS;
 }
+#pragma GCC diagnostic pop
 
 test_return_t generate_buffer_data(memcached_st *memc)
 {

=== modified file 'tests/libmemcached-1.0/pool.cc'
--- tests/libmemcached-1.0/pool.cc	2013-04-03 13:14:23 +0000
+++ tests/libmemcached-1.0/pool.cc	2013-06-14 07:11:24 +0000
@@ -252,10 +252,12 @@
   pthread_exit(arg);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
 test_return_t connection_pool3_test(memcached_st *memc)
 {
 #ifdef __APPLE__
-  return TEST_SKIPPED;
+  SKIP_IF(__APPLE__);
 #endif
 
   memcached_pool_st* pool= memcached_pool_create(memc, 1, 1);
@@ -321,6 +323,7 @@
 
   return TEST_SUCCESS;
 }
+#pragma GCC diagnostic pop
 
 static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options)
 {

=== modified file 'tests/libmemcached-1.0/sasl.cc'
--- tests/libmemcached-1.0/sasl.cc	2013-04-20 09:51:38 +0000
+++ tests/libmemcached-1.0/sasl.cc	2013-06-14 07:11:24 +0000
@@ -64,28 +64,21 @@
  */
 static test_return_t sasl_auth_test(memcached_st *memc)
 {
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT)
-  {
-    test_compare(MEMCACHED_SUCCESS, memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0));
-    test_compare(MEMCACHED_SUCCESS, memcached_delete(memc, "foo", 3, 0));
-    test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
-    test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
-    test_compare(MEMCACHED_INVALID_ARGUMENTS, memcached_destroy_sasl_auth_data(NULL));
-    memcached_quit(memc);
-
-    test_compare(MEMCACHED_AUTH_FAILURE, 
-                 memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0));
-    test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
-
-    memcached_quit(memc);
-    return TEST_SUCCESS;
-  }
-#else
-  (void)memc;
-#endif
-
-  return TEST_SKIPPED;
+  SKIP_IF(libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL));
+
+  test_compare(MEMCACHED_SUCCESS, memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0));
+  test_compare(MEMCACHED_SUCCESS, memcached_delete(memc, "foo", 3, 0));
+  test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
+  test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
+  test_compare(MEMCACHED_INVALID_ARGUMENTS, memcached_destroy_sasl_auth_data(NULL));
+  memcached_quit(memc);
+
+  test_compare(MEMCACHED_AUTH_FAILURE, 
+               memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0));
+  test_compare(MEMCACHED_SUCCESS, memcached_destroy_sasl_auth_data(memc));
+
+  memcached_quit(memc);
+  return TEST_SUCCESS;
 }
 
 

=== modified file 'tests/libmemcached_world.h'
--- tests/libmemcached_world.h	2013-04-21 08:19:20 +0000
+++ tests/libmemcached_world.h	2013-06-14 07:11:24 +0000
@@ -47,7 +47,7 @@
 
   if (servers.sasl())
   {
-    SKIP_UNLESS(libtest::has_libmemcached_sasl());
+    SKIP_UNLESS(libmemcached_has_feature(LIBMEMCACHED_FEATURE_HAS_SASL));
 
     // Assume we are running under valgrind, and bail
     if (getenv("TESTS_ENVIRONMENT"))

=== modified file 'tests/memcp.cc'
--- tests/memcp.cc	2013-05-04 09:20:42 +0000
+++ tests/memcp.cc	2013-06-14 07:11:24 +0000
@@ -66,7 +66,7 @@
 static test_return_t server_test(void *)
 {
   int fd;
-  std::string tmp_file= create_tmpfile("memcp", fd);
+  std::string tmp_file= libtest::create_tmpfile("memcp", fd);
   ASSERT_TRUE(tmp_file.c_str());
   struct stat buf;
   ASSERT_EQ(fstat(fd, &buf), 0);

=== modified file 'version.m4'
--- version.m4	2013-05-04 11:12:31 +0000
+++ version.m4	2013-06-14 07:11:24 +0000
@@ -1,1 +1,1 @@
-m4_define([VERSION_NUMBER], [1.1.0-dev])
+m4_define([VERSION_NUMBER], [1.1.0])