projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-190
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index a8fbcafa74f201b7f302e3a9cff72e8ded9ad556..de966c8074273ba8253ba3ad34f9a7052b02dde0 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
4
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.1
5
],[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])
@@
-19,6
+19,7
@@
AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-u
AC_PREREQ([2.61])
AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS.
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])
#shared library versioning
AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
#shared library versioning
@@
-47,6
+48,7
@@
m4_include([libhashkit/include.m4])
LT_PREREQ([2.2])
LT_INIT
LT_LANG([C++])
LT_PREREQ([2.2])
LT_INIT
LT_LANG([C++])
+LT_LIB_M
AX_ASSERT
AX_ASSERT
@@
-108,10
+110,10
@@
AC_SEARCH_LIBS([gethostbyname],[nsl])
# Checks for header files.
AC_CHECK_HEADERS_ONCE([arpa/inet.h])
# Checks for header files.
AC_CHECK_HEADERS_ONCE([arpa/inet.h])
-AC_CHECK_HEADERS_ONCE([dlfcn.h])
AC_CHECK_HEADERS_ONCE([errno.h])
AC_CHECK_HEADERS_ONCE([execinfo.h])
AC_CHECK_HEADERS_ONCE([fcntl.h])
AC_CHECK_HEADERS_ONCE([errno.h])
AC_CHECK_HEADERS_ONCE([execinfo.h])
AC_CHECK_HEADERS_ONCE([fcntl.h])
+AC_CHECK_HEADERS_ONCE([fnmatch.h])
AC_CHECK_HEADERS_ONCE([inttypes.h])
AC_CHECK_HEADERS_ONCE([libintl.h])
AC_CHECK_HEADERS_ONCE([limits.h])
AC_CHECK_HEADERS_ONCE([inttypes.h])
AC_CHECK_HEADERS_ONCE([libintl.h])
AC_CHECK_HEADERS_ONCE([limits.h])
@@
-121,6
+123,7
@@
AC_CHECK_HEADERS_ONCE([math.h])
AC_CHECK_HEADERS_ONCE([netdb.h])
AC_CHECK_HEADERS_ONCE([netinet/in.h])
AC_CHECK_HEADERS_ONCE([netinet/tcp.h])
AC_CHECK_HEADERS_ONCE([netdb.h])
AC_CHECK_HEADERS_ONCE([netinet/in.h])
AC_CHECK_HEADERS_ONCE([netinet/tcp.h])
+AC_CHECK_HEADERS_ONCE([poll.h])
AC_CHECK_HEADERS_ONCE([pthread.h])
AC_CHECK_HEADERS_ONCE([spawn.h])
AC_CHECK_HEADERS_ONCE([stdarg.h])
AC_CHECK_HEADERS_ONCE([pthread.h])
AC_CHECK_HEADERS_ONCE([spawn.h])
AC_CHECK_HEADERS_ONCE([stdarg.h])
@@
-131,13
+134,14
@@
AC_CHECK_HEADERS_ONCE([sys/socket.h])
AC_CHECK_HEADERS_ONCE([sys/sysctl.h])
AC_CHECK_HEADERS_ONCE([sys/time.h])
AC_CHECK_HEADERS_ONCE([sys/un.h])
AC_CHECK_HEADERS_ONCE([sys/sysctl.h])
AC_CHECK_HEADERS_ONCE([sys/time.h])
AC_CHECK_HEADERS_ONCE([sys/un.h])
+AC_CHECK_HEADERS_ONCE([sys/wait.h])
AC_CHECK_HEADERS_ONCE([syslog.h])
AC_CHECK_HEADERS_ONCE([time.h])
AC_CHECK_HEADERS_ONCE([unistd.h])
# Windows only
AC_CHECK_HEADERS_ONCE([syslog.h])
AC_CHECK_HEADERS_ONCE([time.h])
AC_CHECK_HEADERS_ONCE([unistd.h])
# Windows only
-AC_CHECK_HEADERS([winsock2.h])
-AC_CHECK_HEADERS([ws2tcpip.h])
+AC_CHECK_HEADERS
_ONCE
([winsock2.h])
+AC_CHECK_HEADERS
_ONCE
([ws2tcpip.h])
# Checks for typedefs, structures, and compiler characteristics.
# Checks for typedefs, structures, and compiler characteristics.
@@
-160,6
+164,7
@@
AC_CHECK_FUNCS([pipe2])
AC_CHECK_FUNCS([putenv])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
AC_CHECK_FUNCS([putenv])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
+AC_CHECK_FUNCS([sigignore])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([sqrt])
AC_CHECK_FUNCS([strcasecmp])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([sqrt])
AC_CHECK_FUNCS([strcasecmp])
@@
-184,6
+189,7
@@
AM_CONDITIONAL([BUILD_CACHE],[test "x$build_cache" = "xyes"])
AX_COMPILER_VENDOR
AX_COMPILER_VENDOR
+AC_CHECK_TYPES([in_port_t])
AC_CHECK_TYPES([ptrdiff_t])
AC_HEADER_STDBOOL
AC_TYPE_INT16_T
AC_CHECK_TYPES([ptrdiff_t])
AC_HEADER_STDBOOL
AC_TYPE_INT16_T
@@
-213,15
+219,9
@@
AC_CHECK_LIB([rt],[clock_gettime],
AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])],
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])],
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
-# Check for the ability to call dlopen
-AS_IF([test "x$enable_static" = "xyes"],
- [AC_CHECK_LIB([dl],[dlopen],
- [AC_SUBST([DL_LIB],[-ldl])
- AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])])],
- [AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen])])
-
AC_CHECK_LIB([m],[floor]
)
-A
C_CHECK_FUNCS([sigignore])
+
# Check for the ability to call dlopen (used in libhostile
)
+A
X_DLOPEN
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"],
@@
-251,7
+251,6
@@
AC_CHECK_FUNCS([setppriv],
build_solaris_privs=yes])
])
build_solaris_privs=yes])
])
-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_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"],
@@
-263,7
+262,6
@@
SOCKET_SEND_FLAGS
AX_UUID_GENERATE_TIME_SAFE
AX_UUID_GENERATE_TIME_SAFE
-
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
[AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
AX_PTHREAD_TIMEDJOIN_NP
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
[AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
AX_PTHREAD_TIMEDJOIN_NP
@@
-279,9
+277,9
@@
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
CHECK_FOR_PTHREAD_AND_SASL
CHECK_FOR_PTHREAD_AND_SASL
-# backtrace()
does not work with static builds.
+# backtrace()
, others require shared builds
AS_IF([test "x$enable_shared" = "xyes"],
AS_IF([test "x$enable_shared" = "xyes"],
- [AC_DEFINE([
AX_ENABLE_BACKTRACE],[1],[Support for
backtrace().])])
+ [AC_DEFINE([
HAVE_SHARED_ENABLED],[1],[Enable code which requires shared library support. Like
backtrace().])])
AM_CONDITIONAL([SHARED_ENABLED],[test "x$enable_shared" = "xyes"])
PANDORA_ENABLE_DTRACE
AM_CONDITIONAL([SHARED_ENABLED],[test "x$enable_shared" = "xyes"])
PANDORA_ENABLE_DTRACE
@@
-316,7
+314,7
@@
echo " * Assertions enabled: $ax_enable_assert"
echo " * Debug enabled: $ax_enable_debug"
echo " * Shared: $enable_shared"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
echo " * Debug enabled: $ax_enable_debug"
echo " * Shared: $enable_shared"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
-echo " * SASL support: $a
x_sasl_option
"
+echo " * SASL support: $a
c_enable_sasl
"
echo " * make -j: $enable_jobserver"
echo " * VCS checkout: $ac_cv_vcs_checkout"
echo ""
echo " * make -j: $enable_jobserver"
echo " * VCS checkout: $ac_cv_vcs_checkout"
echo ""