Merge tree from intel box.

diff --combined bootstrap.sh
index 9c2e18d9c1a0ceedf819d4ec6562f6e650b30d82,4bc2148a84f7ad57e5e78fc0905048c52e27f7d0..ae25df01761669faee11cf1633c2e0add072119c
--- 1/bootstrap.sh
--- 2/bootstrap.sh
+++ b/bootstrap.sh
@@@ -234,6 -234,8 +234,8 @@@ function set_VENDOR_RELEASE (
          VENDOR_RELEASE="precise"
        elif [[ "x$VENDOR_RELEASE" == 'x12.10' ]]; then
          VENDOR_RELEASE="quantal"
+       elif [[ "x$VENDOR_RELEASE" == 'x13.04' ]]; then
+         VENDOR_RELEASE="raring"
        fi
        ;;
      opensuse)
@@@ -893,21 -895,16 +895,16 @@@ function make_for_continuus_integratio
        assert_exec_file 'configure'
        assert_file 'Makefile'
  
-       make_target 'all'
- 
        # make rpm includes "make distcheck"
        if [[ -f rpm.am ]]; then
+         make_target 'all'
          make_rpm
        elif [[ -d rpm ]]; then
+         make_target 'all'
          make_rpm
        else
          make_distcheck
        fi
- 
-       assert_exec_file 'configure'
-       assert_file 'Makefile'
- 
-       make_install_system
        ;;
      *-precise-*)
        run_configure
@@@ -915,19 -912,23 +912,23 @@@
        assert_exec_file 'configure'
        assert_file 'Makefile'
  
-       make_target 'all'
- 
        make_distcheck
+       ;;
+     *-quantal-*)
+       run_configure
  
        assert_exec_file 'configure'
        assert_file 'Makefile'
  
-       make_valgrind
+       make_distcheck
+       ;;
+     *-raring-*)
+       run_configure
  
        assert_exec_file 'configure'
        assert_file 'Makefile'
  
-       make_install_system
+       make_distcheck
        ;;
      *)
        make_jenkins_default
@@@ -1745,7 -1746,7 +1746,7 @@@ function main (
        fi
  
        if [ -z "$MAKE_TARGET" ]; then
 -        MAKE_TARGET='jenkins'
 +        MAKE_TARGET='check'
        fi
      fi
    fi

diff --combined configure.ac
index 97565c46076323ae1f8fea31001d2dd1b3df8196,45ee0e7ed2244e5122f866617abbf4c3eccfa283..6f768b152f1995917e74f0d35a29378bb3e2b13d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -6,7 -6,8 +6,8 @@@
  # Use and distribution licensed under the BSD license.  See
  # the COPYING file in this directory for full text.
  
- AC_INIT([libmemcached],[1.0.17],[http://libmemcached.org/])
+ m4_include([version.m4])
+ AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  
@@@ -50,9 -51,6 +51,9 @@@ LT_INI
  LT_LANG([C++])
  LT_LIB_M
  
 +AC_PROG_CC_C99
 +AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
 +
  AX_ASSERT
  
  AX_PLATFORM
@@@ -107,7 -105,7 +108,7 @@@ AC_PROG_AW
  AC_PROG_SED
  AC_PROG_MKDIR_P
  AC_CHECK_PROGS([LEX],['flex'],[:])
- AC_CHECK_PROGS([YACC],['bison'],[:])
+ AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
  AX_PROG_SPHINX_BUILD
  AX_PROG_MEMCACHED