Try to setup initial DNS a bit earlier in the process so that we can make use of...

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index aa15f8e3b63890b61c7fe75b666b6a76ea15e221..69385463598c36e7ff988a7b06c23f6ba2712f14 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -7,15 +7,22 @@ libmemcached_libmemcached_la_SOURCES =
 include libmemcached/csl/include.am
 
 EXTRA_DIST+= \
-            libmemcached/configure.h.in \
             libmemcached/libmemcached_probes.d \
             libmemcached/memcached/README.txt
 
+nobase_include_HEADERS+= \
+                        libmemcached/memcached.h \
+                        libmemcached/memcached.hpp \
+                        libmemcached/util.h
+
 noinst_HEADERS+= \
+                libmemcached/array.h \
                 libmemcached/assert.hpp \
                 libmemcached/backtrace.hpp \
                 libmemcached/byteorder.h \
+                libmemcached/close_socket.hpp \
                 libmemcached/common.h \
+                libmemcached/connect.hpp \
                 libmemcached/continuum.hpp \
                 libmemcached/do.hpp \
                 libmemcached/error.hpp \
@@ -24,74 +31,24 @@ noinst_HEADERS+= \
                 libmemcached/io.h \
                 libmemcached/io.hpp \
                 libmemcached/is.h \
+                libmemcached/key.hpp \
                 libmemcached/libmemcached_probes.h \
+                libmemcached/memcached/protocol_binary.h \
+                libmemcached/memcached/vbucket.h \
                 libmemcached/memory.h \
+                libmemcached/namespace.h \
                 libmemcached/options.hpp \
-                libmemcached/protocol/ascii_handler.h \
-                libmemcached/protocol/binary_handler.h \
-                libmemcached/protocol/common.h \
                 libmemcached/response.h \
                 libmemcached/server.hpp \
                 libmemcached/server_instance.h \
                 libmemcached/string.hpp \
-                libmemcached/virtual_bucket.h
-
-nobase_include_HEADERS+= \
-                        libmemcached/allocators.h \
-                        libmemcached/analyze.h \
-                        libmemcached/array.h \
-                        libmemcached/auto.h \
-                        libmemcached/basic_string.h \
-                        libmemcached/behavior.h \
-                        libmemcached/callback.h \
-                        libmemcached/configure.h \
-                        libmemcached/constants.h \
-                        libmemcached/delete.h \
-                        libmemcached/dump.h \
-                        libmemcached/error.h \
-                        libmemcached/exception.hpp \
-                        libmemcached/fetch.h \
-                        libmemcached/flush.h \
-                        libmemcached/flush_buffers.h \
-                        libmemcached/get.h \
-                        libmemcached/hash.h \
-                        libmemcached/memcached.h \
-                        libmemcached/memcached.hpp \
-                        libmemcached/memcached/protocol_binary.h \
-                        libmemcached/memcached/vbucket.h \
-                        libmemcached/options.h \
-                        libmemcached/parse.h \
-                        libmemcached/namespace.h \
-                        libmemcached/protocol/cache.h \
-                        libmemcached/protocol/callback.h \
-                        libmemcached/protocol_handler.h \
-                        libmemcached/quit.h \
-                        libmemcached/return.h \
-                         libmemcached/platform.h \
-                        libmemcached/result.h \
-                         libmemcached/sasl.h \
-                        libmemcached/server.h \
-                        libmemcached/server_list.h \
-                        libmemcached/stats.h \
-                        libmemcached/storage.h \
-                        libmemcached/strerror.h \
-                        libmemcached/string.h \
-                        libmemcached/types.h \
-                        libmemcached/verbosity.h \
-                        libmemcached/version.h \
-                        libmemcached/visibility.h \
-                        libmemcached/watchpoint.h
+                libmemcached/virtual_bucket.h \
+                libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_CFLAGS= \
-                                    ${AM_CFLAGS} \
-                                    ${NO_CONVERSION} \
-                                    -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
 
-libmemcached_libmemcached_la_CXXFLAGS= \
-                                      ${AM_CXXFLAGS} \
-                                      ${NO_CONVERSION} \
-                                      -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 
 libmemcached_libmemcached_la_SOURCES+= \
                                       ${libhashkit_libhashkit_la_SOURCES} \
@@ -108,10 +65,12 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/do.cc \
                                       libmemcached/dump.cc \
                                       libmemcached/error.cc \
+                                      libmemcached/exist.cc \
                                       libmemcached/fetch.cc \
                                       libmemcached/flush.cc \
                                       libmemcached/flush_buffers.cc \
                                       libmemcached/get.cc \
+                                      libmemcached/touch.cc \
                                       libmemcached/hash.cc \
                                       libmemcached/hosts.cc \
                                       libmemcached/initialize_query.cc \
@@ -139,11 +98,19 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 
 
 libmemcached_libmemcached_la_DEPENDENCIES=
-libmemcached_libmemcached_la_LIBADD= $(LIBM)
-libmemcached_libmemcached_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
+libmemcached_libmemcached_la_LIBADD=
+libmemcached_libmemcached_la_LDFLAGS=
+if TARGET_LINUX
+libmemcached_libmemcached_la_LIBADD+= -lm
+endif
+libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
 libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
+if HAVE_SASL
+libmemcached_libmemcached_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcached_la_LIBADD+= ${PTHREAD_LIBS}
+endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h