exsltRegisterAll in proper place

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

diff --git a/configure.ac b/configure.ac
index 3b951a9..b9a0398 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,33 +60,49 @@ 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])
 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" -a -n "$libgcryptversion"; then
-    AC_CHECK_LIB([memcached],[memcached_get])
+    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>