From: Trond Norbye <trond.norbye@gmail.com>
Date: Wed, 28 Jul 2010 17:42:50 +0000 (+0200)
Subject: Fixed building of dlls on win32
X-Git-Tag: 0.44~12^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fa150066f0c9e4a175be9e3a13a06ef98ee868a3;p=m6w6%2Flibmemcached

Fixed building of dlls on win32
---

diff --git a/configure.ac b/configure.ac
index 4be37b7d..d3a4a349 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,10 @@ AC_CHECK_FUNCS([getline])
 
 PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_LIBEVENT
+my_saved_libs="$LIBS"
+LIBS=
 PANDORA_REQUIRE_PTHREAD
+LIBS="$my_saved_libs"
 PANDORA_CXX_DEMANGLE
 
 dnl Specialty checks
diff --git a/libmemcached/include.am b/libmemcached/include.am
index 4d705fd0..fccced99 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -66,7 +66,8 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
 						libmemcached/protocol/pedantic.c \
 						libmemcached/protocol/protocol_handler.c
 
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
+libmemcached_libmemcachedprotocol_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
 
 noinst_LTLIBRARIES+= \
 		     libmemcached/libmemcachedcallbacks.la
@@ -133,8 +134,9 @@ libmemcached_libmemcachedutil_la_SOURCES= \
 					  libmemcached/util/ping.c \
 					  libmemcached/util/pool.c \
 					  libmemcached/util/version.c
+libmemcached_libmemcachedutil_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${LIBPTHREAD} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
 
 if BUILD_BYTEORDER
diff --git a/win32/include.am b/win32/include.am
index 751a3719..f81ae3e3 100644
--- a/win32/include.am
+++ b/win32/include.am
@@ -2,3 +2,10 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 noinst_HEADERS+= win32/wrappers.h
+
+if BUILD_WIN32_WRAPPERS
+libmemcached_libmemcached_la_LDFLAGS+=-no-undefined
+libmemcached_libmemcachedprotocol_la_LDFLAGS+=-no-undefined
+libmemcached_libmemcachedutil_la_LDFLAGS+=-no-undefined
+libhashkit_libhashkit_la_LDFLAGS+=-no-undefined
+endif