projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update after fixing clang issue with pragma.
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 1ff7b29bdeaf5097761651016dc7e4e0dc139939..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.
6
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.
11
],[http://libmemcached.org/])
-AC_CONFIG_AUX_DIR(
config
)
+AC_CONFIG_AUX_DIR(
[config]
)
AC_CANONICAL_TARGET
AC_CANONICAL_TARGET
@@
-20,20
+20,20
@@
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'], [:])
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
AC_CHECK_PROGS([YACC], ['bison'], [:])
AC_CHECK_PROGS([LEX], ['flex'], [:])
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=1
0
:0:0
+MEMCACHED_LIBRARY_VERSION=1
1
:0:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-49,7
+49,7
@@
AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION)
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
-HASHKIT_LIBRARY_VERSION=
1
:0:0
+HASHKIT_LIBRARY_VERSION=
2
:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
LT_PREREQ([2.2])
AC_SUBST(HASHKIT_LIBRARY_VERSION)
LT_PREREQ([2.2])
@@
-63,14
+63,16
@@
AX_CXX_HEADER_STDCXX_98
AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
fi
AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
fi
-m4_include([m4/memcached.m4])
+# Adding support for libtest
+m4_include([libtest/yatl.m4])
+
m4_include([m4/memcached_sasl.m4])
m4_include([m4/gearmand.m4])
m4_include([m4/libgearman.m4])
m4_include([m4/memcached_sasl.m4])
m4_include([m4/gearmand.m4])
m4_include([m4/libgearman.m4])
-m4_include([memcached/version.m4])
AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
+AM_CONDITIONAL(HAVE_LIBDRIZZLE, false)
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
AM_CONDITIONAL(BUILDING_GEARMAN, false)
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
AM_CONDITIONAL(BUILDING_GEARMAN, false)
@@
-78,17
+80,7
@@
AM_CONDITIONAL(BUILDING_GEARMAN, false)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
-case "$target_os" in
- *linux*)
- AS_IF([test "x$GCC" = "xyes"],
- [
- LDFLAGS="$LDFLAGS -z relro -z now"
- ])
- ;;
- esac
-
dnl Specialty checks
dnl Specialty checks
-AX_PTHREAD
AX_CXX_CINTTYPES
CONFIG_EXTRA
DETECT_BYTEORDER
AX_CXX_CINTTYPES
CONFIG_EXTRA
DETECT_BYTEORDER
@@
-101,12
+93,14
@@
PROTOCOL_BINARY_TEST
ENABLE_DEPRECATED
AC_CHECK_FUNCS([alarm])
ENABLE_DEPRECATED
AC_CHECK_FUNCS([alarm])
+AC_CHECK_FUNCS([clock_gettime])
AC_CHECK_FUNCS([dup2])
AC_CHECK_FUNCS([getline])
AC_CHECK_FUNCS([gettimeofday])
AC_CHECK_FUNCS([memchr])
AC_CHECK_FUNCS([memmove])
AC_CHECK_FUNCS([memset])
AC_CHECK_FUNCS([dup2])
AC_CHECK_FUNCS([getline])
AC_CHECK_FUNCS([gettimeofday])
AC_CHECK_FUNCS([memchr])
AC_CHECK_FUNCS([memmove])
AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([pipe2])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
AC_CHECK_FUNCS([socket])
@@
-120,15
+114,22
@@
AC_CHECK_FUNCS([strtoul])
AC_CHECK_FUNCS([strtoull])
AC_CHECK_HEADERS([arpa/inet.h])
AC_CHECK_FUNCS([strtoull])
AC_CHECK_HEADERS([arpa/inet.h])
+AC_CHECK_HEADERS([errno.h])
+AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_HEADERS([fcntl.h])
AC_CHECK_HEADERS([fcntl.h])
+AC_CHECK_HEADERS([inttypes.h])
AC_CHECK_HEADERS([libintl.h])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_HEADERS([malloc.h])
AC_CHECK_HEADERS([libintl.h])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_HEADERS([malloc.h])
+AC_CHECK_HEADERS([math.h])
AC_CHECK_HEADERS([netdb.h])
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([netdb.h])
AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([pthread.h])
+AC_CHECK_HEADERS([stdarg.h])
AC_CHECK_HEADERS([stddef.h])
AC_CHECK_HEADERS([stddef.h])
+AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([
execinfo
.h])
+AC_CHECK_HEADERS([
unistd
.h])
AC_CHECK_HEADERS([cxxabi.h],
AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
AC_CHECK_HEADERS([cxxabi.h],
AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
@@
-184,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],
[
@@
-217,6
+211,7
@@
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
AC_DEFINE([HAVE_LIBDRIZZLE], [0], [Support for libdrizzle])
AC_DEFINE([HAVE_DRIZZLED_BINARY], [0], [Support for DrizzleD])
AC_DEFINE([HAVE_LIBDRIZZLE], [0], [Support for libdrizzle])
AC_DEFINE([HAVE_DRIZZLED_BINARY], [0], [Support for DrizzleD])
+AC_DEFINE([DRIZZLED_BINARY], [0], [Support for DrizzleD])
AC_DEFINE([GEARMAND_BLOBSLAP_WORKER], [0], [Support for Gearman Blobslap worker])
AC_DEFINE([HAVE_LIBPQ], [0], [Support for Postgres])
AC_DEFINE([HAVE_LIBCURL], [0], [Support for libcurl])
AC_DEFINE([GEARMAND_BLOBSLAP_WORKER], [0], [Support for Gearman Blobslap worker])
AC_DEFINE([HAVE_LIBPQ], [0], [Support for Postgres])
AC_DEFINE([HAVE_LIBCURL], [0], [Support for libcurl])
@@
-281,7
+276,14
@@
if test $ac_cv_c_endian = little; then
fi
])
fi
])
-AC_C_ENDIAN
+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_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
+
+AX_HARDEN_CC_COMPILER_FLAGS
+
+AX_DEBUG
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile
@@
-293,7
+295,6
@@
AC_CONFIG_FILES([
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec
- libtest/version.h
])
AC_OUTPUT
])
AC_OUTPUT
@@
-304,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"