Trond's fix for Mark's build issue

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 253978b2daa453b2527c9a89076fa23294e1ccda..f1333afad7b0c34c1aef6dc296e195ac621b6c8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# libmemcached 
+# libmemcached
 # Copyright (C) 2008 Brian Aker, Monty Taylor
 # All rights reserved.
 #
@@ -6,7 +6,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.32],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.34],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
@@ -37,7 +37,7 @@ AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION)
 if test "$lt_cv_prog_gnu_ld" = "yes"
 then
     LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/libmemcached.ver"
-    LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcachedutil/libmemcachedutil.ver"
+    LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/util/libmemcachedutil.ver"
     LD_PROTOCOL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/protocol/libmemcachedprotocol.ver"
 fi
 AC_SUBST(LD_VERSION_SCRIPT)
@@ -69,7 +69,7 @@ AC_LINK_IFELSE(
       float f= floorf((float) 1.0);
     ]],
     [LIBM="-lm"],[LIBM=""])])
-    
+
 AC_SUBST(LIBM)
 LIBS="$save_LIBS"
 
@@ -84,7 +84,7 @@ REQUIRE_POD2MAN
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
-
+PANDORA_HAVE_LIBINNODB
 
 AC_CONFIG_FILES([
   Makefile
@@ -94,8 +94,6 @@ AC_CONFIG_FILES([
   example/Makefile
   libmemcached/Makefile
   libmemcached/memcached_configure.h
-  libmemcachedutil/Makefile
-  libmemcached/protocol/Makefile
   support/Makefile
   support/libmemcached.pc
   support/libmemcached.spec