projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Possible fix for Ubuntu
[m6w6/libmemcached]
/
m4
/
pandora_have_libtokyocabinet.m4
diff --git
a/m4/pandora_have_libtokyocabinet.m4
b/m4/pandora_have_libtokyocabinet.m4
index cc4d8878781e1785952d3c1d5ee99e6a50442c0a..91906a7c9187c394ade0c73a35a28c21126dcbaa 100644
(file)
--- 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.
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>
AS_IF([test "x$ac_enable_libtokyocabinet" = "xyes"],[
AC_LIB_HAVE_LINKFLAGS(tokyocabinet,,[
#include <tcutil.h>
+#include <tcadb.h>
],[
const char *test= tcversion;
],[
const char *test= tcversion;
+bool ret= tcadboptimize(NULL, "params");
])
],[
ac_cv_libtokyocabinet="no"
])
],[
ac_cv_libtokyocabinet="no"
@@
-31,11
+33,11
@@
const char *test= tcversion;
AS_IF([test "${ac_cv_libtokyocabinet}" = "no" -a "${ac_enable_libtokyocabinet}" = "yes"],[
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}
ac_cv_libtokyocabinet=yes
LTLIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
LIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
- ],[])
+ ],[
test x = y
])
])
AM_CONDITIONAL(HAVE_LIBTOKYOCABINET, [test "${ac_cv_libtokyocabinet}" = "yes"])
])
AM_CONDITIONAL(HAVE_LIBTOKYOCABINET, [test "${ac_cv_libtokyocabinet}" = "yes"])