Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170

[awesomized/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 2465b058c228ade522f9962458b03e7efea255f6..74da20f08992136b0d56fd135143066c3fd28342 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -26,7 +26,6 @@ noinst_HEADERS+= libmemcached/encoding_key.h
 noinst_HEADERS+= libmemcached/error.hpp 
 noinst_HEADERS+= libmemcached/flag.hpp 
 noinst_HEADERS+= libmemcached/initialize_query.h 
-noinst_HEADERS+= libmemcached/instance.h 
 noinst_HEADERS+= libmemcached/instance.hpp
 noinst_HEADERS+= libmemcached/internal.h 
 noinst_HEADERS+= libmemcached/io.h 
@@ -52,7 +51,7 @@ noinst_HEADERS+= libmemcached/virtual_bucket.h
 noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_DEPENDENCIES=
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
@@ -116,9 +115,11 @@ 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+= @SASL_LIB@
+libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
+endif
 endif
 
 if HAVE_DTRACE
@@ -126,7 +127,7 @@ BUILT_SOURCES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/libmemcached_probes.o
 
-libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 endif