X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=9b8a82c581c3a0241ed5b3403eb008430a198cfc;hb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;hp=1bcf1ae201a0aca3bd7544db1cf71ef1e19ca219;hpb=ea32b463888ecfd7525eb88859cc2bb4af9b24d3;p=m6w6%2Flibmemcached diff --git a/configure.ac b/configure.ac index 1bcf1ae2..9b8a82c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,25 @@ -# libmemcached -# Copyright (C) 2008 Brian Aker, Monty Taylor +#!/usr/bin/env bash +# 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.35],[http://tangent.org/552/libmemcached.html]) -AC_CONFIG_SRCDIR([libmemcached/memcached.c]) +AC_INIT([libmemcached],[0.49],[http://libmemcached.org/]) +AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -PANDORA_CANONICAL_TARGET +PANDORA_CANONICAL_TARGET(no-vc-changelog) +AC_CHECK_PROGS([YACC], ['bison'], [:]) +AC_CHECK_PROGS([LEX], ['flex'], [:]) #shared library versioning -MEMCACHED_LIBRARY_VERSION=3:0:0 +MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0 +MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 +MEMCACHED_LIBRARY_VERSION=7:0:0 # | | | # +------+ | +---+ # | | | @@ -26,161 +30,127 @@ MEMCACHED_LIBRARY_VERSION=3:0:0 # | +- increment if source code has changed # | set to zero if current is incremented # +- increment if interfaces have been added, removed or changed +AC_SUBST(MEMCACHED_UTIL_LIBRARY_VERSION) +AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION) AC_SUBST(MEMCACHED_LIBRARY_VERSION) -MEMCACHEDUTIL_LIBRARY_VERSION=0:0:0 -AC_SUBST(MEMCACHEDUTIL_LIBRARY_VERSION) -MEMCACHEDPROTOCOL_LIBRARY_VERSION=0:0:0 -AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION) - - -# libmemcached versioning when linked with GNU ld. -if test "$lt_cv_prog_gnu_ld" = "yes" -then - LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/libmemcached.ver" - LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/util/libmemcachedutil.ver" - LD_PROTOCOL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/protocol/libmemcachedprotocol.ver" -fi -AC_SUBST(LD_VERSION_SCRIPT) -AC_SUBST(LD_UTIL_VERSION_SCRIPT) -AC_SUBST(LD_PROTOCOL_VERSION_SCRIPT) - - - -#-------------------------------------------------------------------- -# Check for libevent -#-------------------------------------------------------------------- -trylibeventdir="" -AC_ARG_WITH(libevent, - [ --with-libevent=PATH Specify path to libevent installation ], - [ - if test "x$withval" != "xno" ; then - trylibeventdir=$withval - fi - ] -) - -dnl ------------------------------------------------------ -dnl libevent detection. swiped from Tor. modified a bit. - -LIBEVENT_URL=http://www.monkey.org/~provos/libevent/ - -AC_CACHE_CHECK([for libevent directory], ac_cv_libevent_dir, [ - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - le_found=no - for ledir in $trylibeventdir "" $prefix /usr/local ; do - LDFLAGS="$saved_LDFLAGS" - LIBS="$saved_LIBS -levent" - - # Skip the directory if it isn't there. - if test ! -z "$ledir" -a ! -d "$ledir" ; then - continue; - fi - if test ! -z "$ledir" ; then - if test -d "$ledir/lib" ; then - LDFLAGS="-L$ledir/lib $LDFLAGS" - else - LDFLAGS="-L$ledir $LDFLAGS" - fi - if test -d "$ledir/include" ; then - CPPFLAGS="-I$ledir/include $CPPFLAGS" - else - CPPFLAGS="-I$ledir $CPPFLAGS" - fi - fi - # Can I compile and link it? - AC_TRY_LINK([#include -#include -#include ], [ event_init(); ], - [ libevent_linked=yes ], [ libevent_linked=no ]) - if test $libevent_linked = yes; then - if test ! -z "$ledir" ; then - ac_cv_libevent_dir=$ledir - else - ac_cv_libevent_dir="(system)" - fi - le_found=yes - break - fi - done - LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" - CPPFLAGS="$saved_CPPFLAGS" - if test $le_found = no ; then - AC_MSG_ERROR([libevent is required. You can get it from $LIBEVENT_URL - - If it's already installed, specify its path using --with-libevent=/dir/ -]) - fi + + +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 ]) -LIBS="$LIBS -levent" -if test $ac_cv_libevent_dir != "(system)"; then - if test -d "$ac_cv_libevent_dir/lib" ; then - LDFLAGS="-L$ac_cv_libevent_dir/lib $LDFLAGS" - le_libdir="$ac_cv_libevent_dir/lib" - else - LDFLAGS="-L$ac_cv_libevent_dir $LDFLAGS" - le_libdir="$ac_cv_libevent_dir" - fi - if test -d "$ac_cv_libevent_dir/include" ; then - CPPFLAGS="-I$ac_cv_libevent_dir/include $CPPFLAGS" - else - CPPFLAGS="-I$ac_cv_libevent_dir $CPPFLAGS" - fi -fi - - -#-------------------------------------------------------------------- -# Check for libpthread -#-------------------------------------------------------------------- - -ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread)) -LIBS="${PTHREAD_LIBS} ${LIBS}" -CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" -CC="$PTHREAD_CC" +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 + +#ifndef HAVE_MSG_NOSIGNAL +#define MSG_NOSIGNAL 0 +#endif + +#ifndef HAVE_MSG_DONTWAIT +#define MSG_DONTWAIT 0 +#endif + +#ifndef HAVE_MSG_MORE +#define MSG_MORE 0 +#endif + +#endif +]) AC_SEARCH_LIBS(getopt_long, gnugetopt) -AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) -save_LIBS="$LIBS" -LIBS="$LIBS -lm" -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include - ]],[[ - float f= floorf((float) 1.0); - ]], - [LIBM="-lm"],[LIBM=""])]) +AC_CHECK_FUNCS([getline]) -AC_SUBST(LIBM) -LIBS="$save_LIBS" - -AC_SEARCH_LIBS(floorf, m) +PANDORA_HAVE_LIBEVENT +my_saved_libs="$LIBS" +LIBS= +PANDORA_REQUIRE_PTHREAD +LIBS="$my_saved_libs" dnl Specialty checks DETECT_BYTEORDER ENABLE_UTILLIB SETSOCKOPT_SANITY ENABLE_HSIEH_HASH -REQUIRE_POD2MAN +ENABLE_MURMUR_HASH PROTOCOL_BINARY_TEST WITH_MEMCACHED ENABLE_DEPRECATED PANDORA_HAVE_LIBINNODB +PANDORA_PRINT_CALLSTACK +PANDORA_HAVE_SASL + +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"]) +AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT) + +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])])]) + +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") +AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", + [AM_LDFLAGS="$AM_LDFLAGS -lws2_32" + AM_CFLAGS="$AM_CFLAGS $NO_WERROR" + AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" + ]) +DETECT_EAGAIN +SOCKET_SEND_FLAGS AC_CONFIG_FILES([ Makefile - clients/Makefile - tests/Makefile - docs/Makefile - example/Makefile - libmemcached/Makefile - libmemcached/memcached_configure.h - support/Makefile + libhashkit/configure.h + libmemcached/configure.h support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec @@ -200,3 +170,15 @@ echo " * Warnings as failure: $ac_cv_warnings_as_errors" echo "" echo "---" +case "$host_os" in + *freebsd*) + echo "*****" + echo "*" + echo "* NOTE: You are on FreeBSD. BSD make will not work." + echo "*" + echo "* use 'gmake' To build libmemcached" + echo "*" + echo "*****" + ;; +esac +