Merge in fixes for SASL.

[m6w6/libmemcached] / libmemcachedinternal / util / include.am

diff --git a/libmemcachedinternal/util/include.am b/libmemcachedinternal/util/include.am
index c18a4eff8a7070f80a3236e51102bb7ddd8191e4..7b5e800726a5a53c0ecf264e2a22cc873a2aef95 100644 (file)
--- a/libmemcachedinternal/util/include.am
+++ b/libmemcachedinternal/util/include.am
@@ -8,16 +8,11 @@
 noinst_LTLIBRARIES+= libmemcachedinternal/libmemcachedutilinternal.la
 
 libmemcachedinternal_libmemcachedutilinternal_la_SOURCES= $(libmemcached_libmemcachedutil_la_SOURCES)
-libmemcachedinternal_libmemcachedutilinternal_la_CFLAGS= \
-                                                        ${AM_CFLAGS} \
-                                                        ${NO_CONVERSION} \
-                                                        ${PTHREAD_CFLAGS} \
-                                                        -DBUILDING_LIBMEMCACHEDINTERNAL
 libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS= \
                                                           ${AM_CXXFLAGS} \
                                                           ${NO_CONVERSION} \
-                                                          ${PTHREAD_CFLAGS} \
                                                           -DBUILDING_LIBMEMCACHEDINTERNAL
+libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
 libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS}
 libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la