X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=8215965b634b26ee11c3c04e46cd306ff52570b3;hb=901d63226e7c2385b6f169f9f09007f65a0c2fe4;hp=5d392ca3aef731f79a0c3f9ddd94501846192cc5;hpb=c9f472b091b351b206d34b9fa37e28b6d1e4202c;p=m6w6%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 5d392ca3..8215965b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,13 @@
-AC_INIT(src/memcat.c)
+AC_INIT(clients/memcat.c)
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(include/libmemcached_config.h)
+AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)
+AC_CANONICAL_SYSTEM
 
 MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=8
+MEMCACHED_MINOR_VERSION=22
 MEMCACHED_MICRO_VERSION=0
 
 #API version
@@ -14,7 +15,7 @@ MEMCACHED_API_VERSION=1.0
 AC_SUBST(MEMCACHED_API_VERSION)
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=1:0:0
+MEMCACHED_LIBRARY_VERSION=2:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -36,7 +37,7 @@ MEMCACHED_RELEASE=$MEMCACHED_MAJOR_VERSION.$MEMCACHED_MINOR_VERSION
 AC_SUBST(MEMCACHED_RELEASE)
 AC_SUBST(MEMCACHED_VERSION)
 
-VERSION=$MEMCACHED_VERSION
+VERSION=$MEMCACHED_RELEASE
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 
@@ -56,9 +57,9 @@ if test "$GCC" = "yes"
 then
   if test "$ENABLE_DEBUG" = "yes"
   then
-    CFLAGS="-Wall -ggdb -DHAVE_DEBUG"
+    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG"
   else
-    CFLAGS="-Wall -O3"
+    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL "
   fi
 else
   CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -fast -m64"
@@ -67,6 +68,7 @@ else
 fi
 
 AC_C_CONST
+AC_HEADER_TIME
 AC_TYPE_SIZE_T
-AC_CHECK_HEADERS(limits.h syslimits.h)
-AC_OUTPUT(Makefile src/Makefile tests/Makefile docs/Makefile lib/Makefile include/Makefile support/Makefile support/libmemcached.pc)
+AC_SEARCH_LIBS(getopt_long, gnugetopt)
+AC_OUTPUT(Makefile clients/Makefile tests/Makefile docs/Makefile libmemcached/Makefile support/Makefile support/libmemcached.pc support/libmemcached.spec)