projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
configure: fix compiler detection
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e74ebb7b0f5b49936e4e73ae9d7628b2fbae10e2..86f986a7d658aa5f187c0dfb0ca98b8c355c80ea 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,3
+1,5
@@
+# configure.ac -*- autoconf -*- vim: filetype=config
+#
# LibmemcacheD
# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# LibmemcacheD
# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
@@
-7,16
+9,17
@@
# the COPYING file in this directory for full text.
m4_include([version.m4])
# the COPYING file in this directory for full text.
m4_include([version.m4])
+
AC_PREREQ([2.61])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
AC_PREREQ([2.61])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+
# Setup the compilers early on
AC_PROG_CC([cc gcc clang])
AC_PROG_CXX([c++ g++ clang++])
# Setup the compilers early on
AC_PROG_CC([cc gcc clang])
AC_PROG_CXX([c++ g++ clang++])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
-
AC_CANONICAL_HOST
AC_ARG_PROGRAM
AC_USE_SYSTEM_EXTENSIONS
AC_CANONICAL_HOST
AC_ARG_PROGRAM
AC_USE_SYSTEM_EXTENSIONS
@@
-47,6
+50,7
@@
AC_SUBST([MEMCACHED_LIBRARY_VERSION])
AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+AC_SUBST([RPM_RELEASE],[1])
m4_include([libhashkit/include.m4])
m4_include([libhashkit/include.m4])
@@
-69,6
+73,17
@@
AC_DEFUN([CHECK_CXX0X],[
])
CHECK_CXX0X
])
CHECK_CXX0X
+
+AC_LANG_PUSH([C])
+AX_COMPILER_VENDOR
+AX_COMPILER_VERSION
+AC_LANG_POP([C])
+AC_LANG_PUSH([C++])
+AX_COMPILER_VENDOR
+AX_COMPILER_VERSION
+AC_LANG_POP([C++])
+
+
AX_ASSERT
AX_PLATFORM
AX_ASSERT
AX_PLATFORM
@@
-120,6
+135,9
@@
AC_CHECK_PROGS([PERL],[perl])
AC_CHECK_PROGS([VALGRIND],['valgrind'])
AC_CHECK_PROGS([WINE],['wine'])
AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
AC_CHECK_PROGS([VALGRIND],['valgrind'])
AC_CHECK_PROGS([WINE],['wine'])
AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
+AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
+AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
+AC_CHECK_PROGS([RPM],[rpm])
AC_PROG_AWK
AC_PROG_MKDIR_P
AC_PROG_SED
AC_PROG_AWK
AC_PROG_MKDIR_P
AC_PROG_SED
@@
-143,6
+161,7
@@
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])
+AC_CHECK_HEADERS_ONCE([linux/sysctl.h])
AC_CHECK_HEADERS_ONCE([mach/mach.h])
AC_CHECK_HEADERS_ONCE([malloc.h])
AC_CHECK_HEADERS_ONCE([math.h])
AC_CHECK_HEADERS_ONCE([mach/mach.h])
AC_CHECK_HEADERS_ONCE([malloc.h])
AC_CHECK_HEADERS_ONCE([math.h])
@@
-214,8
+233,6
@@
AC_CHECK_HEADER([umem.h],
AM_CONDITIONAL([BUILD_CACHE],[test "x$build_cache" = "xyes"])
AM_CONDITIONAL([BUILD_CACHE],[test "x$build_cache" = "xyes"])
-AX_COMPILER_VENDOR
-
AC_CHECK_TYPES([in_port_t],,,[[
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
AC_CHECK_TYPES([in_port_t],,,[[
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@
-328,7
+345,7
@@
AX_HARDEN_COMPILER_FLAGS
AX_AM_JOBSERVER([yes])
AC_CONFIG_FILES([Makefile
AX_AM_JOBSERVER([yes])
AC_CONFIG_FILES([Makefile
- docs/conf.py
+ docs/
source/
conf.py
libmemcached-1.0/configure.h
support/libmemcached.pc
support/libmemcached.spec
libmemcached-1.0/configure.h
support/libmemcached.pc
support/libmemcached.spec
@@
-341,9
+358,9
@@
echo ""
echo " * Installation prefix: $prefix"
echo " * System type: $host_vendor-$host_os"
echo " * Host CPU: $host_cpu"
echo " * Installation prefix: $prefix"
echo " * System type: $host_vendor-$host_os"
echo " * Host CPU: $host_cpu"
-echo " * C Compiler: $
CC_VERSION
"
+echo " * C Compiler: $
ax_cv_c_compiler_vendor $ax_cv_c_compiler_version
"
echo " * C Flags: $CFLAGS"
echo " * C Flags: $CFLAGS"
-echo " * C++ Compiler: $
CXX_VERSION
"
+echo " * C++ Compiler: $
ax_cv_cxx_compiler_vendor $ax_cv_cxx_compiler_version
"
echo " * C++ Flags: $CXXFLAGS"
echo " * CPP Flags: $CPPFLAGS"
echo " * LIB Flags: $LIB"
echo " * C++ Flags: $CXXFLAGS"
echo " * CPP Flags: $CPPFLAGS"
echo " * LIB Flags: $LIB"