projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for version 1.0.13
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index dc7b8ca70bda407e7a38169f07a26e8e07a0ee95..feaadda389e30ecd66d822d06c33e1df57ff1330 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,7
+6,7
@@
# 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.1
2
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.1
3
],[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])
@@
-35,18
+35,24
@@
MEMCACHED_LIBRARY_VERSION=11:0:0
# | +- increment if source code has changed
# | set to zero if current is incremented
# +- increment if interfaces have been added, removed or changed
# | +- 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
)
+AC_SUBST(
[MEMCACHED_UTIL_LIBRARY_VERSION]
)
+AC_SUBST(
[MEMCACHED_PROTOCAL_LIBRARY_VERSION]
)
+AC_SUBST(
[MEMCACHED_LIBRARY_VERSION]
)
-HASHKIT_LIBRARY_VERSION=2:0:0
-AC_SUBST(HASHKIT_LIBRARY_VERSION)
+AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
+AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+
+m4_include([libhashkit/include.m4])
LT_PREREQ([2.2])
LT_INIT
LT_LANG([C++])
LT_PREREQ([2.2])
LT_INIT
LT_LANG([C++])
+
+AX_ASSERT
+
+AX_PLATFORM
+
gl_VISIBILITY
gl_VISIBILITY
-PANDORA_PLATFORM
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AX_CXX_HEADER_STDCXX_98
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AX_CXX_HEADER_STDCXX_98
@@
-177,6
+183,7
@@
AC_C_RESTRICT
AX_CXX_GCC_ABI_DEMANGLE
AX_SASL_CHECK
AX_CXX_GCC_ABI_DEMANGLE
AX_SASL_CHECK
+AX_LIBEVENT
dnl
dnl The sasl functions should only be visible if we build with sasl support
dnl
dnl The sasl functions should only be visible if we build with sasl support
@@
-195,12
+202,12
@@
AC_CHECK_LIB([rt], [clock_gettime], [
])
# Check for the ability to call dlopen
])
# Check for the ability to call dlopen
-AC_CHECK_LIB([dl], [dlopen],[
+AC_CHECK_LIB([dl], [dlopen],
[
DL_LIB="-ldl"
DL_LIB="-ldl"
- AC_SUBST(
DL_LIB
)
- AC_DEFINE([HAVE_LIBDL],
[ 1 ],
[Have dlopen])
+ AC_SUBST(
[DL_LIB]
)
+ AC_DEFINE([HAVE_LIBDL],
[1],
[Have dlopen])
],[
],[
- AC_DEFINE([HAVE_LIBDL], [
0
], [Have dlopen])
+ AC_DEFINE([HAVE_LIBDL], [
0
], [Have dlopen])
])
AC_CHECK_LIB([m], [floor])
])
AC_CHECK_LIB([m], [floor])
@@
-208,8
+215,8
@@
AC_CHECK_FUNCS([sigignore])
AC_CHECK_HEADERS([atomic.h])
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
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
)
+ 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],
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],
@@
-231,8
+238,8
@@
dnl If you want to add support for other platforms you should check for
dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add
dnl the source file containing the implementation into memcached_SOURCE
dnl in Makefile.am
dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add
dnl the source file containing the implementation into memcached_SOURCE
dnl in Makefile.am
-AC_CHECK_FUNCS(
setppriv
, [
- AC_CHECK_HEADER(
priv.h
, [
+AC_CHECK_FUNCS(
[setppriv]
, [
+ AC_CHECK_HEADER(
[priv.h]
, [
AC_DEFINE([HAVE_DROP_PRIVILEGES], 1,
[Define this if you have an implementation of drop_privileges()])
build_solaris_privs=yes
AC_DEFINE([HAVE_DROP_PRIVILEGES], 1,
[Define this if you have an implementation of drop_privileges()])
build_solaris_privs=yes
@@
-249,11
+256,6
@@
AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
])
SOCKET_SEND_FLAGS
])
SOCKET_SEND_FLAGS
-AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event],
- [LIBEVENT_LDFLAGS="-levent"],
- [AC_MSG_WARN([Unable to find libevent])])
-AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes")
-
AX_UUID_GENERATE_TIME_SAFE
AX_UUID_GENERATE_TIME_SAFE
@@
-262,18
+264,16
@@
AX_PTHREAD_TIMEDJOIN_NP
PANDORA_ENABLE_DTRACE
AX_ENDIAN
PANDORA_ENABLE_DTRACE
AX_ENDIAN
-AX_HEX_VERSION
AX_ASSERT
AX_CXX_COMPILER_VERSION
AX_HARDEN_COMPILER_FLAGS
AX_ASSERT
AX_CXX_COMPILER_VERSION
AX_HARDEN_COMPILER_FLAGS
+AX_AM_JOBSERVER([yes])
+
AC_CONFIG_FILES([
Makefile
docs/conf.py
AC_CONFIG_FILES([
Makefile
docs/conf.py
- libhashkit-1.0/configure.h
libmemcached-1.0/configure.h
libmemcached-1.0/configure.h
- libmemcached-1.2/configure.h
- libmemcached-2.0/configure.h
support/libmemcached.pc
support/libmemcached.spec
])
support/libmemcached.pc
support/libmemcached.spec
])
@@
-290,10
+290,12
@@
echo " * C Flags: $CFLAGS"
echo " * C++ Compiler: $CXX_VERSION"
echo " * C++ Flags: $CXXFLAGS"
echo " * CPP Flags: $CPPFLAGS"
echo " * C++ Compiler: $CXX_VERSION"
echo " * C++ Flags: $CXXFLAGS"
echo " * CPP Flags: $CPPFLAGS"
-echo " * Assertions enabled: $a
c_cv
_assert"
-echo " * Debug enabled: $
with
_debug"
+echo " * Assertions enabled: $a
x_enable
_assert"
+echo " * Debug enabled: $
ax_enable
_debug"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
echo " * SASL support: $ac_enable_sasl"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
echo " * SASL support: $ac_enable_sasl"
+echo " * make -j: $enable_jobserver"
+echo " * VCS checkout: $ac_cv_vcs_checkout"
echo ""
echo "---"
echo ""
echo "---"