From be5a1b0a591d47210a5508e8466f3f704136f280 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 11 Jun 2014 14:37:41 +0200 Subject: [PATCH] configure: cope with hiredis without pkg-config --- configure.ac | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 -- 1.7.10.4