Merge lp:~vjsamuel/libmemcached/fix-gearmand-binary-issue into lp:~tangent-org/libmemcached/trunk

[Vijay Samuel]

[Monty Taylor (mordred)]

There is a better fix for this. As far as I can tell, the include of m4/gearmand.m4 is actually useless in this codebase, and is causing the error in conjunction with the -DGEARMAND_BINARY calls in libtest/include.am. The real solution here is to move the logic around setting all of the symbols set with -D in libtest/include.am into configure.ac, and then to rely on the symbols being in config.h rather than injecting them onto the command line in the makefile.

review: Needs Fixing

=== modified file 'libtest/common.h'
--- libtest/common.h	2011-09-08 19:41:50 +0000
+++ libtest/common.h	2011-10-07 14:08:30 +0000
@@ -25,6 +25,10 @@
 
 #pragma once
 
+#if defined GEARMAND_BINARY
+#undef GEARMAND_BINARY
+#endif
+
 #include <config.h>
 
 #include <cassert>

=== modified file 'libtest/gearmand.cc'
--- libtest/gearmand.cc	2011-08-15 06:40:24 +0000
+++ libtest/gearmand.cc	2011-10-07 14:08:30 +0000
@@ -22,8 +22,6 @@
 
 #include <libtest/common.h>
 
-#include <libtest/gearmand.h>
-
 #include "util/instance.hpp"
 #include "util/operation.hpp"
 

=== modified file 'libtest/skiptest.cc'
--- libtest/skiptest.cc	2011-08-15 06:40:24 +0000
+++ libtest/skiptest.cc	2011-10-07 14:08:30 +0000
@@ -20,7 +20,7 @@
  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <libtest/test.hpp>
 

=== modified file 'libtest/unittest.cc'
--- libtest/unittest.cc	2011-09-19 04:08:52 +0000
+++ libtest/unittest.cc	2011-10-07 14:08:30 +0000
@@ -20,7 +20,7 @@
  */
 
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <libtest/test.hpp>
 

=== modified file 'libtest/wait.cc'
--- libtest/wait.cc	2011-09-19 04:08:52 +0000
+++ libtest/wait.cc	2011-10-07 14:08:30 +0000
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <cstdlib>
 #include <fcntl.h>