X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_have_libtokyocabinet.m4;h=91906a7c9187c394ade0c73a35a28c21126dcbaa;hb=1170b1b371ce7bdb50e8e7ae887687f5a45f81b9;hp=cc4d8878781e1785952d3c1d5ee99e6a50442c0a;hpb=d9dab0a24eebad142b33d00ccb0f87b083f02195;p=m6w6%2Flibmemcached

diff --git a/m4/pandora_have_libtokyocabinet.m4 b/m4/pandora_have_libtokyocabinet.m4
index cc4d8878..91906a7c 100644
--- a/m4/pandora_have_libtokyocabinet.m4
+++ b/m4/pandora_have_libtokyocabinet.m4
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+dnl  Copyright (C) 2009 Sun Microsystems, Inc.
+dnl This file is free software; Sun Microsystems, Inc.
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
  
@@ -22,8 +22,10 @@ AC_DEFUN([_PANDORA_SEARCH_LIBTOKYOCABINET],[
   AS_IF([test "x$ac_enable_libtokyocabinet" = "xyes"],[
     AC_LIB_HAVE_LINKFLAGS(tokyocabinet,,[
 #include <tcutil.h>
+#include <tcadb.h>
     ],[
 const char *test= tcversion;
+bool ret= tcadboptimize(NULL, "params");
     ])
   ],[
     ac_cv_libtokyocabinet="no"
@@ -31,11 +33,11 @@ const char *test= tcversion;
 
   AS_IF([test "${ac_cv_libtokyocabinet}" = "no" -a "${ac_enable_libtokyocabinet}" = "yes"],[
 
-    PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet], [
+    PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet >= 1.4.15], [
       ac_cv_libtokyocabinet=yes
       LTLIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
       LIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
-    ],[])
+    ],[test x = y])
   ])
 
   AM_CONDITIONAL(HAVE_LIBTOKYOCABINET, [test "${ac_cv_libtokyocabinet}" = "yes"])