X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=265ae8993ca5c2e06e3944148870682367b4a3c1;hb=5bb059e5a357331f91fde818f703f0a0aae14a42;hp=4d241ea7bb9f013559639f908fa2784ef4681912;hpb=dd9360e9c96c004c7c5f7eabed2e2b23dac80ccd;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 4d241ea7..265ae899 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,16 +9,17 @@
 # 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_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++])
 
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
-
 AC_CANONICAL_HOST
 AC_ARG_PROGRAM
 AC_USE_SYSTEM_EXTENSIONS
@@ -32,7 +33,7 @@ AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=11:0:0
+MEMCACHED_LIBRARY_VERSION=12:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -49,6 +50,7 @@ AC_SUBST([MEMCACHED_LIBRARY_VERSION])
 
 AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
 AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+AC_SUBST([RPM_RELEASE],[1])
 
 m4_include([libhashkit/include.m4])
 
@@ -63,13 +65,39 @@ AC_SUBST([lt_cv_dlopen_libs])
 AC_PROG_CC_C99
 AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
 
-AC_DEFUN([CHECK_CXX0X],[
-          AC_LANG_PUSH([C++])
-          AX_CHECK_COMPILE_FLAG([-std=c++0x],[
-                                 CXX="$CXX -std=c++0x"])
-          AC_LANG_POP([C++])
-          ])
-CHECK_CXX0X
+AC_LANG_PUSH([C++])
+AX_CHECK_COMPILE_FLAG([-std=gnu++14], [
+  AX_APPEND_COMPILE_FLAGS(["-std=gnu++14"])
+], [
+  AX_CHECK_COMPILE_FLAG([-std=c++14], [
+    AX_APPEND_COMPILE_FLAGS(["-std=c++14"])
+  ], [
+    AX_CHECK_COMPILE_FLAG([-std=gnu++11], [
+      AX_APPEND_COMPILE_FLAGS(["-std=gnu++11"])
+    ], [
+      AX_CHECK_COMPILE_FLAG([-std=c++11], [
+        AX_APPEND_COMPILE_FLAGS(["-std=c++11"])
+      ], [
+        AX_CHECK_COMPILE_FLAG([-std=gnu++0x], [
+          AX_APPEND_COMPILE_FLAGS(["-std=gnu++0x"])
+        ], [
+          AX_APPEND_COMPILE_FLAGS(["-std=c++0x"])
+        ])
+      ])
+    ])
+  ])
+])
+AC_LANG_POP([C++])
+
+
+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
 
@@ -122,6 +150,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([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
@@ -145,6 +176,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([linux/sysctl.h])
 AC_CHECK_HEADERS_ONCE([mach/mach.h])
 AC_CHECK_HEADERS_ONCE([malloc.h])
 AC_CHECK_HEADERS_ONCE([math.h])
@@ -216,8 +248,6 @@ AC_CHECK_HEADER([umem.h],
 
 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>
@@ -327,13 +357,30 @@ AX_ENDIAN
 AX_ASSERT
 AX_HARDEN_COMPILER_FLAGS
 
+# override sompe flags specific to libmemcached
+AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
+AC_LANG_PUSH([C++])
+AX_APPEND_COMPILE_FLAGS([-Wno-long-long -Wno-old-style-cast])
+AC_LANG_POP([C++])
+
+AC_ARG_ENABLE([warnings-as-errors], AS_HELP_STRING([--enable-warnings-as-errors], 
+  [Build with -Werror enabled]), , [enable_warnings_as_errors=no])
+AC_CACHE_CHECK([if all warnings should produce an error], [ac_cv_warnings_as_errors], [
+  AS_IF([test "x$enable_warnings_as_errors" = "xyes"], [
+    ac_cv_warnings_as_errors=yes
+  ], [
+    ac_cv_warnings_as_errors=no
+  ])
+])
+
 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
+                 support/example.cnf
                  ])
 AC_OUTPUT
 
@@ -343,9 +390,9 @@ echo ""
 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++ 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"