Merge, better error messages

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 24d9598215ce303ab4bf10a0e1353a231013540e..7dcc4d9c5ebfcd88042e3f4219111730ee47988a 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -38,6 +38,7 @@ noinst_HEADERS+= \
                 libmemcached/namespace.h \
                 libmemcached/options.hpp \
                 libmemcached/response.h \
+                libmemcached/sasl.hpp \
                 libmemcached/server.hpp \
                 libmemcached/server_instance.h \
                 libmemcached/socket.hpp \
@@ -88,7 +89,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/quit.hpp \
                                       libmemcached/response.cc \
                                       libmemcached/result.cc \
-                                      libmemcached/sasl.hpp \
+                                      libmemcached/sasl.cc \
                                       libmemcached/server.cc \
                                       libmemcached/server_list.cc \
                                       libmemcached/server_list.hpp \
@@ -110,11 +111,11 @@ libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 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}
+libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
+libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
 endif
 
 if HAVE_DTRACE
@@ -132,7 +133,7 @@ SUFFIXES+= .d
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
        $(DTRACE) $(DTRACEFLAGS) -h -o ${top_srcdir}/libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS}
 
 .d.o:
        $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d