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

diff --git a/configure.ac b/configure.ac
index b30c472..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
@@ -59,7 +60,95 @@ if test "$checkBoth" = "1"; then
     AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
 fi
 AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
-dnl
+dnl ------ libgcrypt
+AC_SUBST([GCRYPT_LIBS])
+libgcryptpath=NONE
+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])
+    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
+	libgcryptversion=`$libgcrypt --version`
+	libgcryptversion2=`echo "$libgcryptversion" | awk 'BEGIN { FS = "."; } { printf "%d", [$]1 * 1000 + [$]2;}'`
+	AC_MSG_RESULT([$libgcryptversion])
+	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" -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 0.40 libmemcached; then
+	    AC_MSG_RESULT([yes])
+            CFLAGS="$CFLAGS `$pkgconfigpath --cflags libmemcached`"
+            MEMCACHED_LIBS="`$pkgconfigpath --libs libmemcached`"
+	    AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Define to 1 if memcached is enabled])
+        else
+	    AC_MSG_RESULT([no. Version 0.40 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
 AC_SUBST([SSL_CFLAGS])
 AC_SUBST([SSL_LIBS])