# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[1.0.5],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.11],[http://libmemcached.org/])
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_PREREQ([2.61])
-AC_CONFIG_MACRO_DIR(m4)
+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)
+PANDORA_CANONICAL_TARGET
AC_CHECK_PROGS([YACC], ['bison'], [:])
AC_CHECK_PROGS([LEX], ['flex'], [:])
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=9:0:0
+MEMCACHED_LIBRARY_VERSION=11:0:0
# | | |
# +------+ | +---+
# | | |
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
-HASHKIT_LIBRARY_VERSION=1:0:0
+HASHKIT_LIBRARY_VERSION=2:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
LT_PREREQ([2.2])
-LT_INIT()
+LT_INIT
LT_LANG([C++])
LT_LANG([C])
gl_VISIBILITY
AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
fi
-m4_include([m4/memcached.m4])
+# Adding support for libtest
+m4_include([libtest/yatl.m4])
+
m4_include([m4/memcached_sasl.m4])
m4_include([m4/gearmand.m4])
m4_include([m4/libgearman.m4])
-m4_include([memcached/version.m4])
-AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
-AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
+AM_CONDITIONAL([BUILDING_LIBMEMCACHED], [true])
+AM_CONDITIONAL([HAVE_LIBMEMCACHED], [false])
+AM_CONDITIONAL([HAVE_LIBDRIZZLE], [false])
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
-AM_CONDITIONAL(BUILDING_GEARMAN, false)
+AM_CONDITIONAL([BUILDING_GEARMAN], [false])
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
-case "$target_os" in
- *linux*)
- AS_IF([test "x$GCC" = "xyes"],
- [
- LDFLAGS="$LDFLAGS -z relro -z now"
- ])
- ;;
- esac
-
dnl Specialty checks
-AX_PTHREAD
AX_CXX_CINTTYPES
CONFIG_EXTRA
DETECT_BYTEORDER
PROTOCOL_BINARY_TEST
ENABLE_DEPRECATED
+# Checks for programs.
+AX_PROG_SPHINX_BUILD
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
AC_CHECK_FUNCS([alarm])
+AC_CHECK_FUNCS([clock_gettime])
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([pipe2])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([strtoull])
AC_CHECK_HEADERS([arpa/inet.h])
+AC_CHECK_HEADERS([errno.h])
+AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_HEADERS([fcntl.h])
+AC_CHECK_HEADERS([inttypes.h])
AC_CHECK_HEADERS([libintl.h])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_HEADERS([malloc.h])
+AC_CHECK_HEADERS([math.h])
AC_CHECK_HEADERS([netdb.h])
AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([pthread.h])
+AC_CHECK_HEADERS([stdarg.h])
AC_CHECK_HEADERS([stddef.h])
+AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([execinfo.h])
+AC_CHECK_HEADERS([unistd.h])
AC_CHECK_HEADERS([cxxabi.h],
AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
AX_CXX_GCC_ABI_DEMANGLE
-AX_SASL_OPTION
+AX_SASL_CHECK
dnl
dnl The sasl functions should only be visible if we build with sasl support
dnl
AS_IF([test "x$ac_enable_sasl" = "xyes"], [
[ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1" ]
- ], [
- [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ]
- ])
+ ],[ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ])
AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
-AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid],
- [
- LIBUUID_LDFLAGS="-luuid"
- AC_DEFINE([HAVE_LIBUUID], [ 1 ], [Have libuuid])
- ],
- [
- AC_DEFINE([HAVE_LIBUUID], [ 0 ], [Have libuuid])
- ])
-
AC_CHECK_LIB([rt], [clock_gettime],
[
RT_LIB="-lrt"
AC_DEFINE([HAVE_LIBDRIZZLE], [0], [Support for libdrizzle])
AC_DEFINE([HAVE_DRIZZLED_BINARY], [0], [Support for DrizzleD])
+AC_DEFINE([DRIZZLED_BINARY], [0], [Support for DrizzleD])
AC_DEFINE([GEARMAND_BLOBSLAP_WORKER], [0], [Support for Gearman Blobslap worker])
AC_DEFINE([HAVE_LIBPQ], [0], [Support for Postgres])
AC_DEFINE([HAVE_LIBCURL], [0], [Support for libcurl])
SOCKET_SEND_FLAGS
AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event],
- [
- LIBEVENT_LDFLAGS="-levent"
- ],
- [
- AC_MSG_WARN([Unable to find libevent])
- ])
+ [LIBEVENT_LDFLAGS="-levent"],
+ [AC_MSG_WARN([Unable to find libevent])])
AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes")
-dnl Check if we're a little-endian or a big-endian system, needed by hash code
-AC_DEFUN([AC_C_ENDIAN],
-[AC_CACHE_CHECK(for endianness, ac_cv_c_endian,
-[
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([], [dnl
- long val = 1;
- char *c = (char *) &val;
- exit(*c == 1);
- ])
- ],[
- ac_cv_c_endian=big
- ],[
- ac_cv_c_endian=little
- ])
-])
-if test $ac_cv_c_endian = big; then
- AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian])
-fi
-if test $ac_cv_c_endian = little; then
- AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian])
-fi
-])
+AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
+ [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
+
+AX_UUID_GENERATE_TIME_SAFE
+
+
+AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
+AX_PTHREAD_TIMEDJOIN_NP
-AC_C_ENDIAN
+AX_ENDIAN
+AX_HEX_VERSION
+AX_ASSERT
+AX_CXX_COMPILER_VERSION
+AX_HARDEN_COMPILER_FLAGS
AC_CONFIG_FILES([
Makefile
libmemcached-2.0/configure.h
support/libmemcached.pc
support/libmemcached.spec
- support/libmemcached-fc.spec
- libtest/version.h
])
AC_OUTPUT
echo " * System type: $host_vendor-$host_os"
echo " * Host CPU: $host_cpu"
echo " * C Compiler: $CC_VERSION"
+echo " * C Flags: $CFLAGS"
+echo " * C++ Compiler: $CXX_VERSION"
+echo " * C++ Flags: $CXXFLAGS"
+echo " * CPP Flags: $CPPFLAGS"
echo " * Assertions enabled: $ac_cv_assert"
echo " * Debug enabled: $with_debug"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"