Merge the server failure rehash implementation

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 83463ac63ea02cd204990ababe340323d699c643..a168929ae455519106d31e730a7a4a6e5e0ee9e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ AC_LANG_CPLUSPLUS
 
 sinclude(config/debug.m4)
 sinclude(config/dtrace.m4)
-sinclude(config/memcached.m4)
 sinclude(config/byteorder.m4)
 sinclude(config/64bit.m4)
+sinclude(config/protocol_binary.m4)
 
 # We only support GCC and Sun's forte at the moment
 if test "$GCC" = "yes"
@@ -66,7 +66,6 @@ then
   fi
 else
   CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
-  LDFLAGS="-lsocket -lnsl $LDFLAGS"
   DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
@@ -74,4 +73,6 @@ AC_C_CONST
 AC_HEADER_TIME
 AC_TYPE_SIZE_T
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)