X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=b9a0398f96489d99be0d54fa0a1957d4683efcff;hp=c85286f576dbcf50a7c9bf89ef2377fe61a5e2ec;hb=eb4631c82f3b57fb016234447443268d4f46b933;hpb=35ffe076512941377bb6f3cbdfa774a4ceaf9641

diff --git a/configure.ac b/configure.ac
index c85286f..b9a0398 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([subdir-objects])
+AM_INIT_AUTOMAKE([1.11.1 subdir-objects])
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -60,32 +60,57 @@ 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 ------ 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 "$memcached" != "no" -a -n "$libgcryptversion"; then
+    AC_CHECK_LIB([memcached],[memcached_get], [MEMCACHED_LIBS="-lmemcached"])
     if test "$ac_cv_lib_memcached_memcached_get" = "yes"; then
 	AC_CHECK_HEADERS([libmemcached/memcached.h])
+	if test "$ac_cv_header_libmemcached_memcached_h" = "yes"; then
+	    AC_CHECK_LIB([memcached],[memcached], [
+		    AC_DEFINE([HAVE_MEMCACHED_FUNC],[1],[Define to 1 if memcached function  is defined])])
+	    AC_TRY_COMPILE(
+		[
+#include <libmemcached/memcached.h>
+		    ],[
+		    memcached_return_t x;
+		    ],[AC_DEFINE([HAVE_MEMCACHED_RETURN_T],[1],[Define to 1 if memcached_return_t is defined])]
+		    )
+	fi
     fi
 fi
 dnl ------ GNU TLS