X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=045b562f593ae6443ecc8bde695bea5ddfb2ade2;hb=3dffdabbb7e41075f7998cd2af6498b42c97f471;hp=8473f1bbab0c4899790cefdd4268b6f4f771c137;hpb=87cd906b2b1a904062c0dbdb017029a3f3a33a5d;p=m6w6%2Flibmemcached diff --git a/configure.ac b/configure.ac index 8473f1bb..045b562f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,22 +1,39 @@ #!/usr/bin/env bash -# libmemcached +# LibmemcacheD +# Copyright (C) 2011 Data Differential, http://datadifferential.com/ # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye # All rights reserved. # # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_PREREQ(2.59) -AC_INIT([libmemcached],[0.46],[http://libmemcached.org/]) -AC_CONFIG_SRCDIR([libmemcached/memcached.c]) +AC_INIT([libmemcached],[0.52],[http://libmemcached.org/]) + AC_CONFIG_AUX_DIR(config) +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE + +AC_CANONICAL_HOST +AC_CANONICAL_BUILD + +AC_PREREQ([2.61]) + +AC_CONFIG_MACRO_DIR(m4) + +AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. + +AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) + PANDORA_CANONICAL_TARGET(no-vc-changelog) +AC_CHECK_PROGS([YACC], ['bison'], [:]) +AC_CHECK_PROGS([LEX], ['flex'], [:]) #shared library versioning -MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0 +MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 -MEMCACHED_LIBRARY_VERSION=6:0:0 +MEMCACHED_LIBRARY_VERSION=8:0:0 # | | | # +------+ | +---+ # | | | @@ -32,85 +49,106 @@ AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION) AC_SUBST(MEMCACHED_LIBRARY_VERSION) -HASHKIT_LIBRARY_VERSION=0:0:0 +HASHKIT_LIBRARY_VERSION=1:0:0 AC_SUBST(HASHKIT_LIBRARY_VERSION) -AH_TOP([ -#ifndef CONFIG_H -#define CONFIG_H - -#ifdef _SYS_FEATURE_TESTS_H -#error "You should include config.h as your first include file" -#endif - -#ifdef WIN32 -#define _WIN32_WINNT 0x0501 -#endif -]) - -AH_BOTTOM([ -#ifdef HAVE_SYS_WAIT_H -#include -#endif - -#ifdef HAVE_FNMATCH_H -#include -#endif - -#ifdef HAVE_POLL_H -#include -#else -#include "poll/poll.h" -#endif - -/* To hide the platform differences between MS Windows and Unix, I am - * going to use the Microsoft way and #define the Microsoft-specific - * functions to the unix way. Microsoft use a separate subsystem for sockets, - * but Unix normally just use a filedescriptor on the same functions. It is - * a lot easier to map back to the unix way with macros than going the other - * way without side effect ;-) - */ -#ifdef WIN32 -#include "win32/wrappers.h" -#define get_socket_errno() WSAGetLastError() -#else -#define INVALID_SOCKET -1 -#define SOCKET_ERROR -1 -#define closesocket(a) close(a) -#define get_socket_errno() errno -#endif - -#endif -]) +LT_INIT +m4_include([m4/memcached.m4]) +m4_include([m4/memcached_sasl.m4]) +m4_include([m4/gearmand.m4]) + +AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true) +AM_CONDITIONAL(HAVE_LIBMEMCACHED, false) +AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support]) + +AM_CONDITIONAL(BUILDING_GEARMAN, false) +AM_CONDITIONAL(HAVE_LIBGEARMAN, false) +AC_DEFINE([HAVE_LIBGEARMAN], [0], [Enables libgearman Support]) AC_SEARCH_LIBS(getopt_long, gnugetopt) AC_SEARCH_LIBS(gethostbyname, nsl) -AC_CHECK_FUNCS([getline]) - -PANDORA_HAVE_LIBGTEST PANDORA_HAVE_LIBEVENT -my_saved_libs="$LIBS" -LIBS= -PANDORA_REQUIRE_PTHREAD -LIBS="$my_saved_libs" -PANDORA_CXX_DEMANGLE + +case "$target_os" in + *linux*) + AS_IF([test "x$GCC" = "xyes"], + [ + LDFLAGS="$LDFLAGS -z relro -z now" + ]) + ;; + esac dnl Specialty checks +ACX_PTHREAD +CONFIG_EXTRA DETECT_BYTEORDER ENABLE_UTILLIB SETSOCKOPT_SANITY ENABLE_HSIEH_HASH +ENABLE_MURMUR_HASH +ENABLE_MEMASLAP PROTOCOL_BINARY_TEST -WITH_MEMCACHED ENABLE_DEPRECATED PANDORA_HAVE_LIBINNODB -PANDORA_PRINT_CALLSTACK PANDORA_HAVE_SASL +AC_CHECK_FUNCS([alarm]) +AC_CHECK_FUNCS([dup2]) +AC_CHECK_FUNCS([getline]) +AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([memchr]) +AC_CHECK_FUNCS([memmove]) +AC_CHECK_FUNCS([memset]) +AC_CHECK_FUNCS([select]) +AC_CHECK_FUNCS([setenv]) +AC_CHECK_FUNCS([socket]) +AC_CHECK_FUNCS([sqrt]) +AC_CHECK_FUNCS([strcasecmp]) +AC_CHECK_FUNCS([strchr]) +AC_CHECK_FUNCS([strdup]) +AC_CHECK_FUNCS([strerror]) +AC_CHECK_FUNCS([strtol]) +AC_CHECK_FUNCS([strtoul]) +AC_CHECK_FUNCS([strtoull]) +AC_CHECK_HEADERS([arpa/inet.h]) +AC_CHECK_HEADERS([fcntl.h]) +AC_CHECK_HEADERS([libintl.h]) +AC_CHECK_HEADERS([limits.h]) +AC_CHECK_HEADERS([malloc.h]) +AC_CHECK_HEADERS([netdb.h]) +AC_CHECK_HEADERS([netinet/in.h]) +AC_CHECK_HEADERS([stddef.h]) +AC_CHECK_HEADERS([sys/time.h]) +AC_CHECK_HEADERS([sasl/sasl.h]) +AC_FUNC_ALLOCA +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_STRERROR_R +AC_HEADER_STDBOOL +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_INT64_T +AC_TYPE_INT8_T +AC_TYPE_OFF_T +AC_TYPE_PID_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T + dnl The sasl functions should only be visible if we build with sasl support AS_IF([test "x$ac_cv_sasl" = "xyes"], - [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1"]) + [ + [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1" ] + ], + [ + [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ] + ] + ) AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT) AC_CHECK_HEADERS([atomic.h]) @@ -122,19 +160,6 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ [1], [Define to true if you want to use functions from atomic.h])])]) -AC_ARG_WITH([docs], - [AS_HELP_STRING([--with-docs], - [Generate documentation (yes|no) @<:@default=yes@:>@])], - [with_docs=$withval], - [with_docs=yes]) - -AS_IF([test "$with_docs" = "yes"], - [ - REQUIRE_POD2MAN - REQUIRE_PODCHECKER - ]) -AM_CONDITIONAL(BUILD_DOCS, test "$with_docs" = "yes") - AC_CHECK_HEADERS_ONCE(winsock2.h poll.h sys/wait.h fnmatch.h) AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno") AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes") @@ -144,15 +169,17 @@ AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" ]) DETECT_EAGAIN +SOCKET_SEND_FLAGS AC_CONFIG_FILES([ Makefile - docs/Makefile + docs/conf.py libhashkit/configure.h libmemcached/configure.h support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec + libtest/version.h ]) AC_OUTPUT @@ -181,13 +208,3 @@ case "$host_os" in ;; esac -AS_IF(test "$with_docs" = "no", - [ - echo "*****" - echo "*" - echo "* WARNING: You are not generating any documentation." - echo "* Please don't ship libmemcached to an end user" - echo "* without documentation..." - echo "*" - echo "*****" - ])