Merge branch 'master' into yaz-728

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

diff --git a/configure.ac b/configure.ac
index b30c472..60aca07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,35 @@ 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
+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])
+    else
+       libgcrypt=$libgcryptpath/libgcrypt-config
+    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`
+       AC_MSG_RESULT([$libgcryptversion])
+       AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present])
+    else
+       AC_MSG_RESULT([no])
+    fi
+fi
+dnl ------ memcached
+memcached=default
+AC_ARG_WITH([memcached], [  --with-memcached        Memcached library], [memcached=$withval])
+if test "$memcached" != "no" -a -n "$libgcryptversion"; then
+    AC_CHECK_LIB([memcached],[memcached_get])
+    if test "$ac_cv_lib_memcached_memcached_get" = "yes"; then
+       AC_CHECK_HEADERS([libmemcached/memcached.h])
+    fi
+fi
 dnl ------ GNU TLS
 AC_SUBST([SSL_CFLAGS])
 AC_SUBST([SSL_LIBS])