X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=33968234713e0a46ff656bacf425461ac2cc1cbc;hb=a242e3cff72d1db0ffde3edcf009a4506e619706;hp=01d43a2fdf1ee7b447fa13b637a8c938ab197454;hpb=26c1a71921b1468d56f6edaa7e6e3855ec1c879f;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 01d43a2f..33968234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,11 @@ AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)
 AC_CANONICAL_SYSTEM
 
-MEMCACHED_LIBRARY_NAME=libmemcached
+MEMCACHED_LIBRARY_NAME=libmemcached 
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=19
+MEMCACHED_MINOR_VERSION=23
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -51,24 +51,34 @@ 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
+CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
 if test "$GCC" = "yes"
 then
+  CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
+
   if test "$ENABLE_DEBUG" = "yes"
   then
-    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG"
-  else
-    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL "
+    CFLAGS="$CFLAGS -ggdb -DHAVE_DEBUG"
   fi
 else
-  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -fast -m64"
-  LDFLAGS="-lsocket -lnsl"
-  DTRACEFLAGS="-64"
+  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
+  if test "$ENABLE_DEBUG" = "yes"
+  then
+    CFLAGS="$CFLAGS -DHAVE_DEBUG"
+  fi
+  DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
+LDFLAGS="-lm"
 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)