X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=0aabc2487c6f254f49ad5f70c24076fb7d7bb030;hb=d9b744aa354952e18e07d6448a4004aa0c7e5802;hp=74da20f08992136b0d56fd135143066c3fd28342;hpb=76bf27c007d5015d3dcf2981c942d8afb2e97302;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 74da20f0..0aabc248 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -38,6 +38,7 @@ noinst_HEADERS+= libmemcached/memcached/vbucket.h
 noinst_HEADERS+= libmemcached/memory.h 
 noinst_HEADERS+= libmemcached/namespace.h 
 noinst_HEADERS+= libmemcached/options.hpp 
+noinst_HEADERS+= libmemcached/poll.h
 noinst_HEADERS+= libmemcached/response.h 
 noinst_HEADERS+= libmemcached/result.h
 noinst_HEADERS+= libmemcached/sasl.hpp 
@@ -49,6 +50,7 @@ noinst_HEADERS+= libmemcached/udp.hpp
 noinst_HEADERS+= libmemcached/version.hpp 
 noinst_HEADERS+= libmemcached/virtual_bucket.h 
 noinst_HEADERS+= libmemcached/watchpoint.h
+noinst_HEADERS+= libmemcached/windows.hpp
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
@@ -57,6 +59,13 @@ libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
 libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 
+if BUILD_WIN32
+libmemcached_libmemcached_la_CFLAGS+= -DBUILDING_HASHKIT
+libmemcached_libmemcached_la_CXXFLAGS+= -DBUILDING_HASHKIT
+libmemcached_libmemcached_la_LIBADD+= -lmingw32
+libmemcached_libmemcached_la_LIBADD+= -lws2_32
+endif
+
 libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc
 libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES}
 libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc
@@ -90,6 +99,7 @@ libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/poll.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
@@ -104,9 +114,9 @@ libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc
-libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/csl/parser.h
@@ -115,12 +125,10 @@ libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION
 libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
 
 if HAVE_SASL
-if HAVE_LIBSASL
 libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
 libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
 endif
-endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h