Update, fix build rules for -j

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 7efdd8fe6d52f3a5b89e9ddaaf94e91d4064a557..aa2c7def7e4904c7f769d43bdf4c459be9333ee7 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -155,11 +155,12 @@ static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
     server->address_info_next= NULL;
   }
 
-  char str_port[NI_MAXSERV];
-  int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port()));
-  if (length >= NI_MAXSERV or length <= 0)
+  char str_port[MEMCACHED_NI_MAXSERV];
+  int length= snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port()));
+  if (length >= MEMCACHED_NI_MAXSERV or length <= 0)
   {
-    return MEMCACHED_FAILURE;
+    return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
+                               memcached_literal_param("snprintf(NI_MAXSERV)"));
   }
 
   struct addrinfo hints;

diff --git a/libmemcached/csl/include.am b/libmemcached/csl/include.am
index 209b52463a759027feb4c1d052edc55569662b07..68489911680881e99ce075b151ac0ff40aa69c5e 100644 (file)
--- a/libmemcached/csl/include.am
+++ b/libmemcached/csl/include.am
@@ -11,8 +11,6 @@ noinst_HEADERS+= libmemcached/csl/scanner.h
 noinst_HEADERS+= libmemcached/csl/server.h
 noinst_HEADERS+= libmemcached/csl/symbol.h
 
-libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/parser.h
-libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/scanner.h
 libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/context.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/parser.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/scanner.cc
@@ -25,7 +23,10 @@ MAINTAINERCLEANFILES+= libmemcached/csl/parser.cc
 MAINTAINERCLEANFILES+= libmemcached/csl/scanner.h
 MAINTAINERCLEANFILES+= libmemcached/csl/scanner.cc
 
-BUILT_SOURCES+= libmemcached/csl/parser.h libmemcached/csl/scanner.h
+BUILT_SOURCES+= libmemcached/csl/parser.cc
+BUILT_SOURCES+= libmemcached/csl/parser.h
+BUILT_SOURCES+= libmemcached/csl/scanner.cc
+BUILT_SOURCES+= libmemcached/csl/scanner.h
 
 libmemcached/csl/parser.h: libmemcached/csl/parser.cc
 

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index 67edcce82aaab93f33b52aab15077386a8ee7c14..625c3e702645075f05b8efaa52fd36ec6f5111f5 100644 (file)
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -318,7 +318,7 @@ memcached_return_t memcached_set_error(org::libmemcached::Instance& self, memcac
     return rc;
   }
 
-  char hostname_port[NI_MAXHOST +NI_MAXSERV + sizeof("host : ")];
+  char hostname_port[MEMCACHED_NI_MAXHOST +MEMCACHED_NI_MAXSERV + sizeof("host : ")];
   size_t size= append_host_to_string(self, hostname_port, sizeof(hostname_port));
 
   memcached_string_t error_host= { hostname_port, size};

diff --git a/libmemcached/hosts.cc b/libmemcached/hosts.cc
index 62b362ad7fee39eb9eed189f1fc14d8d732c9b0b..c189d07b3548002627a5bdd2405fd14ada6ce9b7 100644 (file)
--- a/libmemcached/hosts.cc
+++ b/libmemcached/hosts.cc
@@ -580,7 +580,7 @@ memcached_return_t memcached_server_add_parsed(memcached_st *ptr,
                                                in_port_t port,
                                                uint32_t weight)
 {
-  char buffer[NI_MAXHOST];
+  char buffer[MEMCACHED_NI_MAXHOST];
 
   memcpy(buffer, hostname, hostname_length);
   buffer[hostname_length]= 0;

diff --git a/libmemcached/sasl.cc b/libmemcached/sasl.cc
index 721ff79130fdf4f82886d5b605ae5d8b9e77c99d..e473806984875079573db3f519bb7be7d6220bdc 100644 (file)
--- a/libmemcached/sasl.cc
+++ b/libmemcached/sasl.cc
@@ -67,8 +67,8 @@ sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr)
  */
 static memcached_return_t resolve_names(org::libmemcached::Instance& server, char *laddr, size_t laddr_length, char *raddr, size_t raddr_length)
 {
-  char host[NI_MAXHOST];
-  char port[NI_MAXSERV];
+  char host[MEMCACHED_NI_MAXHOST];
+  char port[MEMCACHED_NI_MAXSERV];
   struct sockaddr_storage saddr;
   socklen_t salen= sizeof(saddr);
 
@@ -180,8 +180,8 @@ memcached_return_t memcached_sasl_authenticate_connection(org::libmemcached::Ins
   assert_msg(server->fd != INVALID_SOCKET, "Programmer error, invalid socket");
 
   /* set ip addresses */
-  char laddr[NI_MAXHOST + NI_MAXSERV];
-  char raddr[NI_MAXHOST + NI_MAXSERV];
+  char laddr[MEMCACHED_NI_MAXHOST + MEMCACHED_NI_MAXSERV];
+  char raddr[MEMCACHED_NI_MAXHOST + MEMCACHED_NI_MAXSERV];
 
   if (memcached_failed(rc= resolve_names(*server, laddr, sizeof(laddr), raddr, sizeof(raddr))))
   {

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index 41a73d3c38bd96cffcfd1587c04e7905813f02f7..8106bec4b0a971f2b3529d5081497c1245b21c8d 100644 (file)
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -67,7 +67,7 @@ class Gearmand : public libtest::Server
 {
 private:
 public:
-  Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary= GEARMAND_BINARY);
+  Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary);
 
   bool ping()
   {
@@ -121,8 +121,8 @@ public:
   bool build(size_t argc, const char *argv[]);
 };
 
-Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary_arg) :
-  libtest::Server(host_arg, port_arg, binary_arg, true)
+Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary_arg) :
+  libtest::Server(host_arg, port_arg, binary_arg, libtool_)
 {
   set_pid_file();
 }
@@ -146,14 +146,28 @@ bool Gearmand::build(size_t argc, const char *argv[])
 
 namespace libtest {
 
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port)
-{
-  return new Gearmand(hostname, try_port);
-}
-
 libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary)
 {
-  return new Gearmand(hostname, try_port, binary);
+  if (binary == NULL)
+  {
+#if defined(GEARMAND_BINARY)
+    binary= GEARMAND_BINARY;
+#endif
+  }
+
+  if (binary == NULL)
+  {
+    return NULL;
+  }
+
+  bool is_libtool_script= true;
+
+  if (binary[0] == '/')
+  {
+    is_libtool_script= false;
+  }
+
+  return new Gearmand(hostname, try_port, is_libtool_script, binary);
 }
 
 }

diff --git a/libtest/gearmand.h b/libtest/gearmand.h
index ef14ce6352153b5ad02731ffb3e61a9072e4b65c..41317d7fdd3a162ee1ea9646e542ef9c753b0078 100644 (file)
--- a/libtest/gearmand.h
+++ b/libtest/gearmand.h
@@ -40,8 +40,6 @@ namespace libtest { struct Server; }
 
 namespace libtest {
 
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port);
-
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary);
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary= NULL);
 
 }

diff --git a/libtest/include.am b/libtest/include.am
index 0e495fafc4c2836e6e7488e443dfec6754ba5b53..23cc90b28be00fc9f48d8bcb71ccd0c9f3a8a729 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -171,10 +171,8 @@ endif
 endif
 
 if HAVE_LIBDRIZZLE
-
 libtest_libtest_la_LIBADD+= $(libdrizzle_LIBS)
 libtest_libtest_la_CXXFLAGS+= $(libdrizzle_CFLAGS)
-
 endif
 
 if BUILDING_GEARMAN
@@ -190,7 +188,7 @@ libtest_unittest_DEPENDENCIES+= libgearman/libgearman.la
 libtest_unittest_DEPENDENCIES+= gearmand/gearmand
 else
 if HAVE_LIBGEARMAN
-libtest_libtest_la_LIBADD+= @LIBGEARMAN_LDFLAGS@
+libtest_libtest_la_LIBADD+= @LIBGEARMAN_LIB@
 libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc

diff --git a/libtest/server.h b/libtest/server.h
index 7ec3096cf6e9372ed7dc0f97ab108486d1d833a2..fa5240569f8531020d590b8fa757260474ff5980 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -281,5 +281,3 @@ private:
 std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
 
 } // namespace libtest
-
-

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index 0ec3e2ce404cdebb67fee4ed40751cadc70dec01..f8e1aa8c650b9f083854361d04a1aaa5ac923d73 100644 (file)
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -42,7 +42,7 @@
 #include <libmemcached-1.0/memcached.h>
 #endif
 
-#if defined(LIBTEST_WITH_LIBGEARMAN_SUPPORT) && LIBTEST_WITH_LIBGEARMAN_SUPPORT
+#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
 #include <libgearman/gearman.h>
 #endif
 
@@ -771,6 +771,16 @@ static test_return_t check_for_gearman(void *)
 {
   test_skip(true, HAVE_LIBGEARMAN);
   test_skip(true, has_gearmand());
+#if defined(GEARMAND_BINARY)
+  if (GEARMAND_BINARY)
+  {
+    test_skip(0, access(GEARMAND_BINARY, X_OK ));
+  }
+  else
+  {
+    return TEST_SKIPPED;
+  }
+#endif
 
   testing_service= "gearmand";
 

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index d13787cd4480c2df4a9d4ec2b2d1a444b1ce986d..2d88a018aa6390335ff19ed9b315cee2c9d029da 100644 (file)
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -43,21 +43,20 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_ASSERT],
     [AC_PREREQ([2.63])dnl
     AC_REQUIRE([AX_DEBUG])
+    AC_REQUIRE([AX_VCS_CHECKOUT])
     AC_ARG_ENABLE([assert],
       [AS_HELP_STRING([--enable-assert],
-        [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],[
-      ax_enable_assert=yes
-      ],[
-      ax_enable_assert=no
-      ])
+        [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],
+      [ax_enable_assert=yes],
+      [ax_enable_assert=no])
 
-    AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ],[
-      ax_enable_assert="yes"
+    AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ],
+      [ax_enable_assert="yes"
       AC_DEFINE(NDEBUG,[1],[Define to 1 to enable assert'ing code.])
       ])
 

diff --git a/m4/libgearman.m4 b/m4/libgearman.m4
index a95c289f8575635f10194e579d28ef85f35f9b10..f4c5d3b0f3bb77b994c71e77749e81233fd5b7d1 100644 (file)
--- a/m4/libgearman.m4
+++ b/m4/libgearman.m4
@@ -1,9 +1,4 @@
-# serial 1
+# serial 2
 AC_DEFUN([CHECK_FOR_LIBGEARMAND],
-    [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman], 
-      [ax_check_for_libgearman=yes],
-      [ax_check_for_libgearman=no])
-    AS_IF([test "$ax_check_for_libgearman" = xyes],
-      [AC_DEFINE([HAVE_LIBGEARMAN],[1],[Enables libgearman Support])],
-      [AC_DEFINE([HAVE_LIBGEARMAN],[0],[Enables libgearman Support])])
+    [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman])
     ])

diff --git a/man/include.am b/man/include.am
index 621fd612925e9f8542eea40b0e72fb2b4898ccd5..3b68557a7937836efb7dd92770c4043742f099ee 100644 (file)
--- a/man/include.am
+++ b/man/include.am
@@ -3,7 +3,6 @@
 # All paths should be given relative to the root
 
 if HAVE_RECENT_SPHINX
-
 if IS_VCS_CHECKOUT
 
 dist-hook: man
@@ -11,10 +10,11 @@ dist-hook: man
 # Build rule for documentation
 $(dist_man_MANS): man
 
-endif
-
 BUILT_SOURCES+= $(dist_man_MANS)
 
+endif
+endif
+
 dist_man_MANS+= man/memaslap.1
 dist_man_MANS+= man/memcapable.1
 dist_man_MANS+= man/memcat.1
@@ -133,5 +133,3 @@ dist_man_MANS+= man/memcached_touch.3
 dist_man_MANS+= man/memcached_touch_by_key.3
 dist_man_MANS+= man/memcached_verbosity.3
 dist_man_MANS+= man/memcached_version.3
-
-endif