From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Jun 2014 12:36:47 +0000 (+0200)
Subject: Merge branch 'yaz-770' of ssh://git.indexdata.com/home/git/pub/yaz into yaz-770
X-Git-Tag: v5.2.0~16
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=85023e194798d21c44599f2057df59956ee20948;hp=c18a5a0c2620b67650b51255ea3139378ac64cec

Merge branch 'yaz-770' of ssh://git.indexdata.com/home/git/pub/yaz into yaz-770
---

diff --git a/configure.ac b/configure.ac
index 049b3ca..0a63754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,7 @@ hiredis=default
 AC_SUBST([HIREDIS_LIBS])
 AC_ARG_WITH([redis], [  --with-redis        hiredis library], [hiredis=$withval])
 if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE"; 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
@@ -111,9 +112,14 @@ if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE"; then
             fi
 	fi
     else
-	AC_MSG_RESULT([no])
-        if test "$hiredis" != "default"; then
-	    AC_MSG_ERROR([hiredis libraries missing])
+	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