configure: only consider hiredis if libgcrypt is also present

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c85286f..887ba56 100644 (file)
--- 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([subdir-objects])
+AM_INIT_AUTOMAKE([1.11.1 subdir-objects])
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -60,32 +60,94 @@ if test "$checkBoth" = "1"; then
 fi
 AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
 dnl ------ libgcrypt
+AC_SUBST([GCRYPT_LIBS])
 libgcryptpath=NONE
-AC_ARG_WITH(libgcrypt, [ --with-libgcrypt=DIR  use libgcrypt-config in DIR],[libgcryptpath=$withval])
+AC_ARG_WITH(libgcrypt, [  --with-libgcrypt=DIR    use libgcrypt-config in DIR],[libgcryptpath=$withval])
 if test "$libgcryptpath" != "no"; then
     if test "$libgcryptpath" = "NONE"; then
        AC_PATH_PROG([libgcrypt],[libgcrypt-config],[NONE])
-    else
+    elif test -x $libgcryptpath/libgcrypt-config; then
        libgcrypt=$libgcryptpath/libgcrypt-config
+    else
+       libgcrypt=$libgcryptpath
     fi
     AC_MSG_CHECKING([for libgcrypt])
     if "$libgcrypt" --version >/dev/null 2>&1; then
-       LIBS="$LIBS `$libgcrypt --libs`"
-       CFLAGS="$CFLAGS `$libgcrypt --cflags`"
        libgcryptversion=`$libgcrypt --version`
+       libgcryptversion2=`echo "$libgcryptversion" | awk 'BEGIN { FS = "."; } { printf "%d", [$]1 * 1000 + [$]2;}'`
        AC_MSG_RESULT([$libgcryptversion])
-       AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present])
+       if test $libgcryptversion2 -ge 1002; then
+           GCRYPT_LIBS="`$libgcrypt --libs`"
+           CFLAGS="$CFLAGS `$libgcrypt --cflags`"
+           AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present])
+       else
+           if test "$libgcryptpath" = "NONE"; then
+               AC_MSG_WARN([Only libgcrypt version 1.2 and later supported])
+           else
+               AC_MSG_ERROR([Only libgcrypt version 1.2 and later supported])
+           fi
+           libgcryptversion=""
+       fi
     else
        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])
 AC_ARG_WITH([memcached], [  --with-memcached        Memcached library], [memcached=$withval])
-if test "$memcached" != "no"; then
-    AC_CHECK_LIB([memcached],[memcached_get])
-    if test "$ac_cv_lib_memcached_memcached_get" = "yes"; then
-       AC_CHECK_HEADERS([libmemcached/memcached.h])
+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
+           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])
+        else
+           AC_MSG_RESULT([no. Version 1.0 required])
+            if test "$memcached" != "default"; then
+               AC_MSG_ERROR([libmemcached  libraries missing])
+            fi
+        fi
+    else
+       AC_MSG_RESULT([no])
+        if test "$memcached" != "default"; then
+           AC_MSG_ERROR([libmemcached  libraries missing])
+       fi
     fi
 fi
 dnl ------ GNU TLS