X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=d0c871c81b3396a28d77d3ec40457a0a1f97e54b;hb=2fe4e1635c70f4b2815aaf9bc147fee0b2c93de3;hp=01d43a2fdf1ee7b447fa13b637a8c938ab197454;hpb=ad7a24fd95054f164913f585551dbd6a34300b35;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 01d43a2f..d0c871c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=19
+MEMCACHED_MINOR_VERSION=22
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -51,20 +51,23 @@ 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"
+  LDFLAGS="-lsocket -lnsl $LDFLAGS"
+  DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
 AC_C_CONST