X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=887ba5642c54de48c782c1f5e469c74d944dc789;hp=049b3cab863ea619046621a872f267b1b34fd37d;hb=d7cba4993e5c7c06c655d9a1d903f889fdee8329;hpb=118a28603418dfc84a5c91463a1d02219e7e9941 diff --git a/configure.ac b/configure.ac index 049b3ca..887ba56 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,8 @@ 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"; then +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 @@ -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