From: Brian Aker <brian@tangent.org>
Date: Sun, 28 Apr 2013 06:53:51 +0000 (-0400)
Subject: Merge tree from intel box.
X-Git-Tag: 1.0.18~25^2~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9d09bd78e83c7798b273e98df63bc9dd76c7b5a9;hp=2b58ac3aa8add64352a41c7f4f9fc88a0f4f2919;p=awesomized%2Flibmemcached

Merge tree from intel box.
---

diff --git a/ChangeLog b/ChangeLog
index 4d20c93c..5fbed160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.0.18
+
 1.0.17 Tue Apr  2 14:02:01 HST 2013
 * Remove c++ namespace that was being exposed (the API should be plug compatible)..
 * Fix cases where --servers wasn't behaving the same in all clients.
diff --git a/Makefile.am b/Makefile.am
index a359ac00..6a851b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
@@ -140,6 +141,7 @@ maintainer-clean-local:
 	-rm -f build-aux/install-sh
 	-rm -f build-aux/ltmain.sh
 	-rm -f build-aux/missing
+	-rm -f build-aux/ylwrap
 	-rm -f mem_config.in
 	-rm -f config.log
 	-rm -f config.status
diff --git a/bootstrap.sh b/bootstrap.sh
index 9c2e18d9..ae25df01 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -234,6 +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 @@ function make_for_continuus_integration ()
       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 @@ function make_for_continuus_integration ()
       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
diff --git a/configure.ac b/configure.ac
index 97565c46..6f768b15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +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])
 
@@ -107,7 +108,7 @@ AC_PROG_AWK
 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
 
diff --git a/version.m4 b/version.m4
new file mode 100644
index 00000000..759ba247
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER], [1.0.18])