X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=36f1162eb64a909b8d2e6376f5f0cf8ad45660b9;hb=ceab093459cec94d6d40f48ade93efa3a74c06a1;hp=f6dd9b63b4df6742ad53d3fc52bea93a268b40f8;hpb=d976a805cfca54ab9f49896d24a54f385949b3cd;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index f6dd9b63..36f1162e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,13 @@
 AC_INIT(clients/memcat.c)
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(libmemcached/libmemcached_config.h) AC_CANONICAL_SYSTEM MEMCACHED_LIBRARY_NAME=libmemcached #release versioning
+AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)
+AC_CANONICAL_SYSTEM
+
+MEMCACHED_LIBRARY_NAME=libmemcached 
+
+#release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=22
+MEMCACHED_MINOR_VERSION=25
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -44,23 +49,31 @@ LIBTOOL="$LIBTOOL --preserve-dup-deps"
 AC_SUBST(LIBTOOL)dnl
 AC_LANG_CPLUSPLUS
 
+sinclude(config/pod2man.m4)
 sinclude(config/debug.m4)
 sinclude(config/dtrace.m4)
 sinclude(config/byteorder.m4)
 sinclude(config/64bit.m4)
 sinclude(config/protocol_binary.m4)
+sinclude(config/memcached.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"
+  CFLAGS="-Wall -O3 $CFLAGS"
+
   if test "$ENABLE_DEBUG" = "yes"
   then
-    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG $CFLAGS"
-  else
-    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL $CFLAGS"
+    CFLAGS="$CFLAGS -ggdb -DHAVE_DEBUG"
   fi
 else
   CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
+  if test "$ENABLE_DEBUG" = "yes"
+  then
+    CFLAGS="$CFLAGS -DHAVE_DEBUG"
+  fi
   DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
@@ -71,4 +84,7 @@ AC_TYPE_SIZE_T
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyname, nsl)
+
+sinclude(config/setsockopt.m4)
+
 AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)