Merge trunk

[m6w6/libmemcached] / libmemcached / protocol / Makefile.am

diff --git a/libmemcached/protocol/Makefile.am b/libmemcached/protocol/Makefile.am
index fb4b0a76c5a86f677cfa8b707b49c052d16bee18..8847016eac88006cf0bd71c98c722dbb3a78fb49 100644 (file)
--- a/libmemcached/protocol/Makefile.am
+++ b/libmemcached/protocol/Makefile.am
@@ -2,7 +2,12 @@ EXTRA_DIST= libmemcachedprotocol.ver
 
 lib_LTLIBRARIES=libmemcachedprotocol.la
 
-noinst_HEADERS = common.h 
+noinst_HEADERS = common.h
 
 libmemcachedprotocol_la_SOURCES= protocol_handler.c cache.c pedantic.c
 libmemcachedprotocol_la_LDFLAGS= -version-info $(MEMCACHEDPROTOCOL_LIBRARY_VERSION) $(LD_PROTOCOL_VERSION_SCRIPT)
+
+if BUILD_BYTEORDER
+libmemcachedprotocol_la_LIBADD=$(top_builddir)/libmemcached/libbyteorder.la
+libmemcachedprotocol_la_DEPENDENCIES= $(top_builddir)/libmemcached/libbyteorder.la
+endif