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-1.0-25
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index eeaccd8244835fb81d6875178d3a6160d50a5168..e1b82ba6ac032fcaf61aea50a9a356c6b50a2b93 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-7,9
+7,9
@@
# 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
0
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.1
1
],[http://libmemcached.org/])
-AC_CONFIG_AUX_DIR(
config
)
+AC_CONFIG_AUX_DIR(
[config]
)
AC_CANONICAL_TARGET
AC_CANONICAL_TARGET
@@
-20,13
+20,13
@@
AC_CANONICAL_BUILD
AC_PREREQ([2.61])
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])
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(
[no-vc-changelog]
)
AC_CHECK_PROGS([YACC], ['bison'], [:])
AC_CHECK_PROGS([LEX], ['flex'], [:])
AC_CHECK_PROGS([YACC], ['bison'], [:])
AC_CHECK_PROGS([LEX], ['flex'], [:])
@@
-185,14
+185,7
@@
AS_IF([test "x$ac_enable_sasl" = "xyes"], [
])
AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
])
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])
- ])
+AX_UUID_GENERATE_TIME_SAFE
AC_CHECK_LIB([rt], [clock_gettime],
[
AC_CHECK_LIB([rt], [clock_gettime],
[
@@
-286,8
+279,11
@@
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_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
[AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
-AX_HARDEN_COMPILER_FLAGS
-AX_PTHREAD
+AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
+
+AX_HARDEN_CC_COMPILER_FLAGS
+
+AX_DEBUG
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile
@@
-309,6
+305,10
@@
echo " * Installation prefix: $prefix"
echo " * System type: $host_vendor-$host_os"
echo " * Host CPU: $host_cpu"
echo " * C Compiler: $CC_VERSION"
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"
echo " * Assertions enabled: $ac_cv_assert"
echo " * Debug enabled: $with_debug"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"