X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=7ceddfed99ca0c98cb50c5be3d11b5dce277ff7b;hp=049b3cab863ea619046621a872f267b1b34fd37d;hb=7cd90b94c031cdd9e8dc677dd9df27de971c4a01;hpb=118a28603418dfc84a5c91463a1d02219e7e9941

diff --git a/configure.ac b/configure.ac
index 049b3ca..7ceddfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.11.1 subdir-objects])
+AM_INIT_AUTOMAKE([1.9 subdir-objects])
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -20,6 +20,7 @@ test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
+AM_PROG_CC_C_O
 AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE])
 dnl
 YAZ_DOC
@@ -95,8 +96,9 @@ 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"; then
+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
@@ -111,9 +113,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
@@ -124,23 +131,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