X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=2cb5ebfaf27e615b22abd474e914593c5be4d1de;hb=04bbb4383e54d431a3513045dad4be62b91c64af;hp=410a2af887e5bb6317ce77f2a1afd4c8f4f74079;hpb=0dcffff2ef5818da721934ea2b22bfd2e2d83779;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 410a2af8..6bb4f284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,84 +1,74 @@
-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
-MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=22
-MEMCACHED_MICRO_VERSION=0
+# libmemcached
+# Copyright (C) 2008 Brian Aker, Monty Taylor
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in this directory for full text.
 
-#API version
-MEMCACHED_API_VERSION=1.0
-AC_SUBST(MEMCACHED_API_VERSION)
-
-#shared library versioning
-MEMCACHED_LIBRARY_VERSION=2:0:0
-#                         | | |
-#                  +------+ | +---+
-#                  |        |     |
-#                 current:revision:age
-#                  |        |     |
-#                  |        |     +- increment if interfaces have been added
-#                  |        |        set to zero if interfaces have been removed or changed
-#                  |        +- increment if source code has changed
-#                  |           set to zero if current is incremented
-#                  +- increment if interfaces have been added, removed or changed
+AC_PREREQ(2.59)
+AC_INIT([libmemcached],[0.36],[http://tangent.org/552/libmemcached.html])
+AC_CONFIG_SRCDIR([libmemcached/memcached.c])
+AC_CONFIG_AUX_DIR(config)
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AC_SUBST(MEMCACHED_LIBRARY_VERSION)
+PANDORA_CANONICAL_TARGET
 
-PACKAGE=$MEMCACHED_LIBRARY_NAME
-AC_SUBST(MEMCACHED_LIBRARY_NAME)
+HASHKIT_LIBRARY_VERSION=0:0:0
+AC_SUBST(HASHKIT_LIBRARY_VERSION)
 
-MEMCACHED_VERSION=$MEMCACHED_MAJOR_VERSION.$MEMCACHED_MINOR_VERSION.$MEMCACHED_MICRO_VERSION
-MEMCACHED_RELEASE=$MEMCACHED_MAJOR_VERSION.$MEMCACHED_MINOR_VERSION
-AC_SUBST(MEMCACHED_RELEASE)
-AC_SUBST(MEMCACHED_VERSION)
+AC_SEARCH_LIBS(getopt_long, gnugetopt)
+AC_SEARCH_LIBS(gethostbyname, nsl)
 
-VERSION=$MEMCACHED_RELEASE
+AC_CHECK_FUNCS_ONCE([getline])
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+PANDORA_HAVE_LIBEVENT
+PANDORA_REQUIRE_PTHREAD
+PANDORA_CXX_DEMANGLE
 
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AM_SANITY_CHECK
-LIBTOOL="$LIBTOOL --preserve-dup-deps"
-AC_SUBST(LIBTOOL)dnl
-AC_LANG_CPLUSPLUS
+dnl Specialty checks
+DETECT_BYTEORDER
+ENABLE_UTILLIB
+SETSOCKOPT_SANITY
+ENABLE_HSIEH_HASH
+REQUIRE_POD2MAN
+REQUIRE_PODCHECKER
+PROTOCOL_BINARY_TEST
+WITH_MEMCACHED
+ENABLE_DEPRECATED
+PANDORA_HAVE_LIBINNODB
+PANDORA_PRINT_CALLSTACK
 
-sinclude(config/debug.m4)
-sinclude(config/dtrace.m4)
-sinclude(config/byteorder.m4)
-sinclude(config/64bit.m4)
-sinclude(config/protocol_binary.m4)
+AC_CHECK_HEADERS([atomic.h])
+AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
+      AC_CHECK_FUNCS(atomic_add_64)
+      AC_CHECK_FUNCS(atomic_add_32)
+      AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],
+            AC_DEFINE([USE_ATOMIC_H],
+	              [1],
+                      [Define to true if you want to use functions from atomic.h])))
 
-# We only support GCC and Sun's forte at the moment
-CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
-if test "$GCC" = "yes"
-then
-  CFLAGS="-W -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -03 $CFLAGS"
+AC_CONFIG_FILES([
+  Makefile
+  docs/Makefile
+  libmemcached/memcached_configure.h
+  libhashkit/Makefile
+  support/libmemcached.pc
+  support/libmemcached.spec
+  support/libmemcached-fc.spec
+  ])
+AC_OUTPUT
 
-  if test "$ENABLE_DEBUG" = "yes"
-  then
-    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
+echo "---"
+echo "Configuration summary for $PACKAGE_NAME version $VERSION"
+echo ""
+echo "   * Installation prefix:       $prefix"
+echo "   * System type:               $host_vendor-$host_os"
+echo "   * Host CPU:                  $host_cpu"
+echo "   * C Compiler:                $CC_VERSION"
+echo "   * Assertions enabled:        $ac_cv_assert"
+echo "   * Debug enabled:             $with_debug"
+echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
+echo ""
+echo "---"
 
-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)