projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-466
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b0870bbfc490758e6dc20372a07d63550379b03b..17b7351e3eabd1ece46ffaf636a456a60b2f1a78 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,3
+1,5
@@
+# configure.ac -*- autoconf -*- vim: filetype=config
+#
# LibmemcacheD
# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# LibmemcacheD
# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
@@
-7,18
+9,23
@@
# the COPYING file in this directory for full text.
m4_include([version.m4])
# the COPYING file in this directory for full text.
m4_include([version.m4])
+
+AC_PREREQ([2.61])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
+
+# Setup the compilers early on
+AC_PROG_CC([cc gcc clang])
+AC_PROG_CXX([c++ g++ clang++])
+
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_
TARGE
T
+AC_CANONICAL_
HOS
T
AC_ARG_PROGRAM
AC_USE_SYSTEM_EXTENSIONS
AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-ustar])
AC_ARG_PROGRAM
AC_USE_SYSTEM_EXTENSIONS
AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-ustar])
-AC_PREREQ([2.61])
-
AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS.
AC_SUBST([AUTOHEADER_FILE],[mem_config.h])
AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS.
AC_SUBST([AUTOHEADER_FILE],[mem_config.h])
AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
@@
-43,27
+50,34
@@
AC_SUBST([MEMCACHED_LIBRARY_VERSION])
AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+AC_SUBST([RPM_RELEASE],[1])
m4_include([libhashkit/include.m4])
LT_PREREQ([2.2])
m4_include([libhashkit/include.m4])
LT_PREREQ([2.2])
-LT_INIT
+LT_INIT
([dlopen])
LT_LANG([C++])
LT_LIB_M
LT_LANG([C++])
LT_LIB_M
+AC_SUBST([lt_cv_dlopen_libs])
+
+
AC_PROG_CC_C99
AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
AC_PROG_CC_C99
AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
+AC_DEFUN([CHECK_CXX0X],[
+ AC_LANG_PUSH([C++])
+ AX_CHECK_COMPILE_FLAG([-std=c++0x],[
+ CXX="$CXX -std=c++0x"])
+ AC_LANG_POP([C++])
+ ])
+CHECK_CXX0X
+
AX_ASSERT
AX_PLATFORM
AX_ASSERT
AX_PLATFORM
-
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AX_CXX_HEADER_STDCXX_98
-AS_IF([test "x$ax_cv_cxx_stdcxx_98" = "xno"],
- [AC_MSG_ERROR([Your system lacks a new enough C++ compiler])])
-
AC_DEFUN([LIBMEMCACHED_PROTOCOL],
[AC_ARG_ENABLE([libmemcachedprotocol],
[AS_HELP_STRING([--enable-libmemcachedprotocol],
AC_DEFUN([LIBMEMCACHED_PROTOCOL],
[AC_ARG_ENABLE([libmemcachedprotocol],
[AS_HELP_STRING([--enable-libmemcachedprotocol],
@@
-110,6
+124,9
@@
AC_CHECK_PROGS([PERL],[perl])
AC_CHECK_PROGS([VALGRIND],['valgrind'])
AC_CHECK_PROGS([WINE],['wine'])
AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
AC_CHECK_PROGS([VALGRIND],['valgrind'])
AC_CHECK_PROGS([WINE],['wine'])
AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
+AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
+AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
+AC_CHECK_PROGS([RPM],[rpm])
AC_PROG_AWK
AC_PROG_MKDIR_P
AC_PROG_SED
AC_PROG_AWK
AC_PROG_MKDIR_P
AC_PROG_SED
@@
-246,9
+263,6
@@
AC_CHECK_LIB([rt],[clock_gettime],
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
-# Check for the ability to call dlopen (used in libhostile)
-AX_DLOPEN
-
AC_CHECK_HEADERS([atomic.h])
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
[AC_CHECK_FUNCS([atomic_add_64])
AC_CHECK_HEADERS([atomic.h])
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
[AC_CHECK_FUNCS([atomic_add_64])
@@
-289,8
+303,10
@@
SOCKET_SEND_FLAGS
AX_UUID_GENERATE_TIME_SAFE
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
AX_UUID_GENERATE_TIME_SAFE
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
- [AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
+ [AC_LANG_PUSH([C++])
+ AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
AX_PTHREAD_TIMEDJOIN_NP
AX_PTHREAD_TIMEDJOIN_NP
+ AC_LANG_POP([C++])
# The sasl functions should only be visible if we build with sasl support
#
# The sasl functions should only be visible if we build with sasl support
#