X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=b9a0398f96489d99be0d54fa0a1957d4683efcff;hp=f4a79c658e7050334891444aebab1778ee3e2261;hb=3c51b85ff62261acc19c6995a041569ec4ef6d63;hpb=be89f721ce59303c3f7261b7bf86b971dff18376

diff --git a/configure.ac b/configure.ac
index f4a79c6..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])
@@ -59,84 +59,66 @@ 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 ------ memcached
-memcached=default
-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])
+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
-fi
-dnl ------ OpenSSL
-AC_SUBST([SSL_CFLAGS])
-AC_SUBST([SSL_LIBS])
-openssl=no
-sslver=no
-AC_ARG_WITH([openssl], [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
-SSL_CFLAGS=""
-SSL_LIBPATH=""
-if test "$openssl" != "no"; then
-    if test "$openssl" != "yes" -a "$openssl" != "default"; then
-	if test -x $openssl/bin/pkg-config; then
-	    if $openssl/bin/pkg-config --exists openssl; then
-		SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
-		SSL_LIBS="`$openssl/bin/pkg-config --libs openssl`"
-		sslver=`$openssl/bin/pkg-config --modversion openssl`
+    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
-	fi
-	if test "$sslver" = "no"; then
-	    SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-	    SSL_LIBPATH="-L$openssl/lib"
+	    libgcryptversion=""
 	fi
     else
-	if test "$pkgconfigpath" != "NONE"; then
-	    if $pkgconfigpath --exists openssl; then
-		SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
-		SSL_LIBS="`$pkgconfigpath --libs openssl`"
-		sslver=`$pkgconfigpath --modversion openssl`
-	    fi
-	fi
-	if test "$sslver" = "no"; then
-	    SSL_CFLAGS="-I/usr/include/openssl"
-	fi
-    fi
-    if test "$sslver" = "no"; then
-	xLIBS="$LIBS";
-	xCPPFLAGS="$CPPFLAGS";
-	CPPFLAGS="$CPPFLAGS ${SSL_CFLAGS} ${SSL_LIBPATH}"
-	SSL_LIBS="${SSL_LIBPATH}"
-	AC_CHECK_LIB([crypto],[main])
-	if test "$ac_cv_lib_crypto_main" = "yes"; then
-	    SSL_LIBS="${SSL_LIBS} -lcrypto"
-	fi
-	AC_CHECK_LIB([ssl],[SSL_new])
-	if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-	    AC_CHECK_HEADER([openssl/ssl.h],[sslver=yes])
-	    SSL_LIBS="${SSL_LIBS} -lssl"
-	fi
-	if test "$sslver" != "yes"; then
-	    SSL_LIBS=""
-	fi
-        LIBS="$xLIBS"
-	CPPFLAGS="$xCPPFLAGS"
+	AC_MSG_RESULT([no])
     fi
-    AC_MSG_CHECKING([for SSL])
-    if test "$sslver" != "no"; then
-	AC_DEFINE([HAVE_OPENSSL_SSL_H],[1],[Define to 1 if OpenSSL is present])
-	AC_MSG_RESULT([$sslver])
-    else
-	SSL_CFLAGS=""
-	AC_MSG_RESULT([None])
-	if test "$openssl" != "default"; then
-	    AC_MSG_ERROR([OpenSSL development libraries missing])
+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"; 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
+AC_SUBST([SSL_CFLAGS])
+AC_SUBST([SSL_LIBS])
 gnutls=default
 AC_ARG_WITH([gnutls], [  --with-gnutls[=PREFIX]    GNU TLS library in PREFIX], [gnutls=$withval])
-if test "$gnutls" != "no" -a "$sslver" = "no"; then
+if test "$gnutls" != "no"; then
     gnutlsver=no
     if test "$gnutls" != "yes" -a "$gnutls" != "default"; then
 	if test -x $gnutls/bin/pkg-config; then