X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=5374f348062771712679e9ec427985a5abbb1bc7;hp=887ba5642c54de48c782c1f5e469c74d944dc789;hb=e9f1f9fae5dd16e2016bf6988631d8111b3c0980;hpb=d7cba4993e5c7c06c655d9a1d903f889fdee8329 diff --git a/configure.ac b/configure.ac index 887ba56..5374f34 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ fi dnl ------ redis hiredis=default AC_SUBST([HIREDIS_LIBS]) -AC_ARG_WITH([redis], [ --with-redis hiredis library], [hiredis=$withval]) +AC_ARG_WITH([redis], [ --with-redis hiredis library], [hiredis=$withval]) if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE" -a "$libgcryptversion"; then AC_CHECK_LIB([hiredis],[redisCommandArgv],[HIREDIS_LIBS=-lhiredis]) AC_MSG_CHECKING([for redis]) @@ -130,23 +130,21 @@ AC_ARG_WITH([memcached], [ --with-memcached Memcached library], [memcach if test "$memcached" != "no" -a -n "$libgcryptversion" -a "$pkgconfigpath" != "NONE"; then AC_MSG_CHECKING([for libmemcached]) if $pkgconfigpath --cflags libmemcached >/dev/null 2>&1 ; then - if $pkgconfigpath --atleast-version 1.0 libmemcached; then + if $pkgconfigpath --atleast-version 0.40 libmemcached; then AC_MSG_RESULT([yes]) CFLAGS="$CFLAGS `$pkgconfigpath --cflags libmemcached`" MEMCACHED_LIBS="`$pkgconfigpath --libs libmemcached`" - AC_DEFINE([HAVE_LIBMEMCACHED_MEMCACHED_H],[1],[Define to 1 if memcached header]) - AC_DEFINE([HAVE_MEMCACHED_FUNC],[1],[Define to 1 if memcached function is defined]) - AC_DEFINE([HAVE_MEMCACHED_RETURN_T],[1],[Define to 1 if memcached_return_t is defined]) + AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Define to 1 if memcached is enabled]) else - AC_MSG_RESULT([no. Version 1.0 required]) + AC_MSG_RESULT([no. Version 0.40 required]) if test "$memcached" != "default"; then - AC_MSG_ERROR([libmemcached libraries missing]) + AC_MSG_ERROR([libmemcached libraries missing]) fi fi else AC_MSG_RESULT([no]) if test "$memcached" != "default"; then - AC_MSG_ERROR([libmemcached libraries missing]) + AC_MSG_ERROR([libmemcached libraries missing]) fi fi fi