marc?.json.marc part of dist

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

diff --git a/configure.ac b/configure.ac
index c85286f..3b951a9 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])
@@ -61,7 +61,7 @@ fi
 AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
 dnl ------ libgcrypt
 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])
@@ -82,10 +82,19 @@ fi
 dnl ------ memcached
 memcached=default
 AC_ARG_WITH([memcached], [  --with-memcached        Memcached library], [memcached=$withval])
-if test "$memcached" != "no"; then
+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])
+       if test "$ac_cv_header_libmemcached_memcached_h" = "yes"; then
+           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