projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Clean up some library usage.
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index a70143abc8b8a3c51715e0462dc7c46897b11a94..696f9baef0053eaaea1f30bee708c6d8bbdb92ef 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,7
+6,8
@@
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[1.0.17],[http://libmemcached.org/])
+m4_include([version.m4])
+AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@
-46,10
+47,24
@@
AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
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_DEFUN([CHECK_CXX0X],[
+ AC_LANG_PUSH([C++])
+ AX_CHECK_COMPILE_FLAG([-std=c++0x],[
+ CXXFLAGS="$CXXFLAGS -std=c++0x"])
+ AC_LANG_POP([C++])
+ ])
+CHECK_CXX0X
+
AX_ASSERT
AX_PLATFORM
AX_ASSERT
AX_PLATFORM
@@
-100,13
+115,20
@@
PROTOCOL_BINARY_TEST
ENABLE_DEPRECATED
# Checks for programs.
ENABLE_DEPRECATED
# Checks for programs.
+AC_CHECK_PROGS([DPKG_GENSYMBOLS],[dpkg-gensymbols])
+AC_CHECK_PROGS([LEX],['flex'],[:])
+AC_CHECK_PROGS([PERL],[perl])
+AC_CHECK_PROGS([VALGRIND],['valgrind'])
+AC_CHECK_PROGS([WINE],['wine'])
+AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
AC_PROG_AWK
AC_PROG_AWK
-AC_PROG_SED
AC_PROG_MKDIR_P
AC_PROG_MKDIR_P
-AC_CHECK_PROGS([LEX],['flex'],[:])
-AC_CHECK_PROGS([YACC],['bison'],[:])
-AX_PROG_SPHINX_BUILD
+AC_PROG_SED
AX_PROG_MEMCACHED
AX_PROG_MEMCACHED
+AX_PROG_SPHINX_BUILD(,[AC_MSG_WARN([sphinx-build version 1.0 or greater is required to build man pages])])
+AX_WITH_PROG([LCOV],[lcov])
+AX_WITH_PROG([LCOV_GENHTML],[genhtml])
+AC_DEFINE([HAVE_MEMCACHED_SASL_BINARY],[0],[If Memcached binary with sasl support is available])
# Checks for libraries.
AC_SEARCH_LIBS([getopt_long],[gnugetopt])
# Checks for libraries.
AC_SEARCH_LIBS([getopt_long],[gnugetopt])
@@
-235,9
+257,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])