Merge in build bits

bin/include.am

@@ -27,9 +27,7 @@ bin_gearadmin_SOURCES= \
 		       bin/gearadmin.cc \
 		       util/instance.cc \
 		       util/operation.cc
-bin_gearadmin_CPPFLAGS= \
-			$(AM_CPPFLAGS) \
-			$(BOOST_CPPFLAGS)
+bin_gearadmin_CXXFLAGS= $(BOOST_CPPFLAGS)
 bin_gearadmin_LDFLAGS= \
 		       $(AM_LDFLAGS) \
 		       $(BOOST_PROGRAM_OPTIONS_LDFLAGS)

configure.ac

@@ -61,8 +61,9 @@ AC_DEFINE([GEARMAND_BINARY], "./gearmand/gearmand", [Name of the gearmand binary
 AC_DEFINE([HAVE_LIBGEARMAN], 1, [libgearman support])
 AC_DEFINE([HAVE_GEARMAND_BINARY], 1, [libgearman support])
 
-BOOST_REQUIRE(1.39.0)
-BOOST_PROGRAM_OPTIONS(mt-)
+dnl First look for Boost, maybe for a specific minimum version:
+BOOST_REQUIRE([1.39])
+BOOST_PROGRAM_OPTIONS([mt-])
 
 WITH_LIBDRIZZLE
 WITH_DRIZZLED

examples/echo_client.cc

@@ -37,7 +37,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <iostream>
 #include <cstdlib>

examples/echo_worker.cc

@@ -36,7 +36,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <cstdlib>
 #include <iostream>

examples/include.am

@@ -20,10 +20,6 @@ EXAMPLES_LD_FLAGS= \
 		   $(CLIENT_LDFLAGS) \
 		   $(LTLIBEVENT) \
 		   $(LTLIBUUID)
-EXAMPLES_CPPFLAGS= \
-		   $(AM_CPPFLAGS) \
-		   $(BOOST_CPPFLAGS)
-
 noinst_PROGRAMS+= \
 		  examples/echo_client \
 		  examples/echo_worker \
@@ -36,40 +32,40 @@ noinst_PROGRAMS+= \
 
 examples_echo_client_SOURCES= examples/echo_client.cc
 examples_echo_client_LDADD= $(EXAMPLES_LDADD)
-examples_echo_client_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_echo_client_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_echo_client_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_echo_worker_SOURCES= examples/echo_worker.cc
 examples_echo_worker_LDADD= $(EXAMPLES_LDADD)
-examples_echo_worker_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_echo_worker_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_echo_worker_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_reverse_client_SOURCES= examples/reverse_client.cc
 examples_reverse_client_LDADD= $(EXAMPLES_LDADD)
-examples_reverse_client_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_reverse_client_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_reverse_client_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_reverse_client_bg_SOURCES= examples/reverse_client_bg.cc
 examples_reverse_client_bg_LDADD= $(EXAMPLES_LDADD)
-examples_reverse_client_bg_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_reverse_client_bg_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_reverse_client_bg_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_reverse_client_epoch_SOURCES= examples/reverse_client_epoch.cc
 examples_reverse_client_epoch_LDADD= $(EXAMPLES_LDADD)
-examples_reverse_client_epoch_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_reverse_client_epoch_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_reverse_client_epoch_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_reverse_client_cb_SOURCES= examples/reverse_client_cb.cc
 examples_reverse_client_cb_LDADD= $(EXAMPLES_LDADD)
-examples_reverse_client_cb_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_reverse_client_cb_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_reverse_client_cb_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_reverse_worker_SOURCES= examples/reverse_worker.cc
 examples_reverse_worker_LDADD= $(EXAMPLES_LDADD)
-examples_reverse_worker_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_reverse_worker_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_reverse_worker_LDFLAGS= $(EXAMPLES_LD_FLAGS)
 
 examples_wc_worker_SOURCES= examples/wc_worker.cc
 examples_wc_worker_LDADD= $(EXAMPLES_LDADD)
-examples_wc_worker_CPPFLAGS= $(EXAMPLES_CPPFLAGS)
+examples_wc_worker_CXXFLAGS= $(BOOST_CPPFLAGS)
 examples_wc_worker_LDFLAGS= $(EXAMPLES_LD_FLAGS)

examples/reverse_client.cc

@@ -36,7 +36,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <cstdlib>
 #include <cstring>

examples/reverse_client_bg.cc

@@ -37,7 +37,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <cstdlib>
 #include <iomanip>

examples/reverse_client_cb.cc

@@ -37,7 +37,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <cstdlib>
 #include <iomanip>

examples/reverse_client_epoch.cc

@@ -36,7 +36,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <cstdlib>
 #include <iomanip>

examples/wc_worker.cc

@@ -36,7 +36,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <cerrno>
 #include <cstdio>