X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=5c9ed3dfcc4f5ac21343351e109cf59a71f882df;hb=c62f7a6ae820d1edf39e72176a08999b8e6d33a5;hp=40e1d67eb18f12191de594b74aa1b8c7e824a9c8;hpb=2f44187ce709c4524aef74f9d2e788d5845829d5;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 40e1d67e..5c9ed3df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=18
+MEMCACHED_MINOR_VERSION=22
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -51,20 +51,21 @@ AC_LANG_CPLUSPLUS
 
 sinclude(config/debug.m4)
 sinclude(config/dtrace.m4)
+sinclude(config/64bit.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