X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=a168929ae455519106d31e730a7a4a6e5e0ee9e9;hb=b34c702fa781b33f8a1f7751385929122c3e6bae;hp=8215965b634b26ee11c3c04e46cd306ff52570b3;hpb=948eeb667c78f158f769de8cc418e44e81048dc2;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 8215965b..a168929a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,24 +51,28 @@ AC_LANG_CPLUSPLUS
 
 sinclude(config/debug.m4)
 sinclude(config/dtrace.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"
 then
   if test "$ENABLE_DEBUG" = "yes"
   then
-    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG"
+    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG $CFLAGS"
   else
-    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL "
+    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL $CFLAGS"
   fi
 else
-  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -fast -m64"
-  LDFLAGS="-lsocket -lnsl"
-  DTRACEFLAGS="-64"
+  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
+  DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
 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)