Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-230

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 68c9fa10fe2def02d0e7e739afea3872e0b2b7c9..f21171d319ce2b883e37b80384dbb04e0e6d90d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 # LibmemcacheD
-# Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
 # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
 # All rights reserved.
 #
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.15],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.16],[http://libmemcached.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -84,8 +84,6 @@ AM_CONDITIONAL([BUILDING_LIBMEMCACHED],[true])
 AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false])
 AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false])
 AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support])
-AC_SUBST([LIBMEMCACHED_CFLAGS])
-AC_SUBST([LIBMEMCACHED_LIB],[libmemcached/libmemcached.la])
 
 AM_CONDITIONAL([BUILDING_GEARMAN],[false])
 
@@ -102,9 +100,13 @@ PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
 
 # Checks for programs.
+AC_PROG_AWK
+AC_PROG_SED
+AC_PROG_MKDIR_P
 AC_CHECK_PROGS([LEX],['flex'],[:])
 AC_CHECK_PROGS([YACC],['bison'],[:])
 AX_PROG_SPHINX_BUILD
+AX_PROG_MEMCACHED
 
 # Checks for libraries.
 AC_SEARCH_LIBS([getopt_long],[gnugetopt])
@@ -289,10 +291,12 @@ AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
          ])
 CHECK_FOR_PTHREAD_AND_SASL
 
-
 # backtrace(), others require shared builds
-AS_IF([test "x$enable_shared" = "xyes"],
-      [AC_DEFINE([HAVE_SHARED_ENABLED],[1],[Enable code which requires shared library support. Like backtrace().])])
+AC_DEFUN([__ENABLE_SHARED],
+         [AC_REQUIRE([AX_PLATFORM])
+         AS_IF([test "x${TARGET_WINDOWS}" = "xtrue"],[enable_shared=no])
+         AS_IF([test "x$enable_shared" = "xyes"],
+               [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