X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=5374f348062771712679e9ec427985a5abbb1bc7;hp=f10df06c41a8d1d2ea82f99c1e002c9b35dd359a;hb=e9f1f9fae5dd16e2016bf6988631d8111b3c0980;hpb=94da887fdc444b624e4736e860e9a1777c92e847

diff --git a/configure.ac b/configure.ac
index f10df06..5374f34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,37 @@ if test "$libgcryptpath" != "no"; then
 	AC_MSG_RESULT([no])
     fi
 fi
+dnl ------ redis
+hiredis=default
+AC_SUBST([HIREDIS_LIBS])
+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])
+    if $pkgconfigpath --cflags hiredis >/dev/null 2>&1 ; then
+	if $pkgconfigpath --atleast-version 0.10 hiredis; then
+	    AC_MSG_RESULT([yes])
+            CFLAGS="$CFLAGS `$pkgconfigpath --cflags hiredis`"
+            HIREDIS_LIBS="`$pkgconfigpath --libs hiredis`"
+	    AC_DEFINE([HAVE_HIREDIS],[1],[Define to 1 if hiredis is enabled])
+	else
+	    AC_MSG_RESULT([no. Version 0.10 required])
+            if test "$hiredis" != "default"; then
+	        AC_MSG_ERROR([hiredis libraries missing])
+            fi
+	fi
+    else
+	if test "$ac_cv_lib_hiredis_redisCommandArgv" = "yes"; then
+	    AC_DEFINE([HAVE_HIREDIS],[1])
+	    AC_MSG_RESULT([yes])
+	else
+	    AC_MSG_RESULT([no])
+            if test "$hiredis" != "default"; then
+		AC_MSG_ERROR([hiredis libraries missing])
+	    fi
+	fi
+    fi
+fi
 dnl ------ memcached
 memcached=default
 AC_SUBST([MEMCACHED_LIBS])
@@ -99,22 +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_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