X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=365422c7866d289931d0b72650ebf149df70230a;hp=ff8b2399f79e13a28f3ee975d1ab486f9c048e18;hb=2a624ff1daa841601aebca86c0196039da6978b3;hpb=3789ac34f90b64e5c9937394a93ae7dadf678055

diff --git a/configure.ac b/configure.ac
index ff8b239..365422c7 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([1.11.1 subdir-objects])
+AM_INIT_AUTOMAKE([1.9 subdir-objects])
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -16,16 +16,18 @@ dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_PROGS([YACC], 'bison -y')
-test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
+test -z "$YACC" -a ! -f src/cql.c && AC_MSG_ERROR([GNU Bison not found])
+test -z "$YACC" && AC_MSG_WARN([GNU Bison not found])
 AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
+AM_PROG_CC_C_O
 AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE])
 dnl
 YAZ_DOC
 dnl
 dnl
-AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[])
+AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h execinfo.h],[],[],[])
 AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
@@ -60,6 +62,7 @@ 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
@@ -76,7 +79,7 @@ if test "$libgcryptpath" != "no"; then
 	libgcryptversion2=`echo "$libgcryptversion" | awk 'BEGIN { FS = "."; } { printf "%d", [$]1 * 1000 + [$]2;}'`
 	AC_MSG_RESULT([$libgcryptversion])
 	if test $libgcryptversion2 -ge 1002; then
-	    LIBS="$LIBS `$libgcrypt --libs`"
+	    GCRYPT_LIBS="`$libgcrypt --libs`"
 	    CFLAGS="$CFLAGS `$libgcrypt --cflags`"
 	    AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present])
 	else
@@ -91,21 +94,59 @@ if test "$libgcryptpath" != "no"; then
 	AC_MSG_RESULT([no])
     fi
 fi
+dnl ------ redis
+hiredis=default
+AC_SUBST([HIREDIS_LIBS])
+AC_ARG_WITH([redis], [  --with-redis            hiredis library], [hiredis=$withval])
+if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE" -a "$libgcryptversion"; then
+    AC_CHECK_LIB([hiredis],[redisCommandArgv],[HIREDIS_LIBS=-lhiredis])
+    AC_MSG_CHECKING([for redis])
+    if $pkgconfigpath --cflags hiredis >/dev/null 2>&1 ; then
+	if $pkgconfigpath --atleast-version 0.10 hiredis; then
+	    AC_MSG_RESULT([yes])
+            CFLAGS="$CFLAGS `$pkgconfigpath --cflags hiredis`"
+            HIREDIS_LIBS="`$pkgconfigpath --libs hiredis`"
+	    AC_DEFINE([HAVE_HIREDIS],[1],[Define to 1 if hiredis is enabled])
+	else
+	    AC_MSG_RESULT([no. Version 0.10 required])
+            if test "$hiredis" != "default"; then
+	        AC_MSG_ERROR([hiredis libraries missing])
+            fi
+	fi
+    else
+	if test "$ac_cv_lib_hiredis_redisCommandArgv" = "yes"; then
+	    AC_DEFINE([HAVE_HIREDIS],[1])
+	    AC_MSG_RESULT([yes])
+	else
+	    AC_MSG_RESULT([no])
+            if test "$hiredis" != "default"; then
+		AC_MSG_ERROR([hiredis libraries missing])
+	    fi
+	fi
+    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])
-    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])]
-		    )
+if test "$memcached" != "no" -a -n "$libgcryptversion" -a "$pkgconfigpath" != "NONE"; then
+    AC_MSG_CHECKING([for libmemcached])
+    if $pkgconfigpath --cflags libmemcached >/dev/null 2>&1 ; then
+	if $pkgconfigpath --atleast-version 0.40 libmemcached; then
+	    AC_MSG_RESULT([yes])
+            CFLAGS="$CFLAGS `$pkgconfigpath --cflags libmemcached`"
+            MEMCACHED_LIBS="`$pkgconfigpath --libs libmemcached`"
+	    AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Define to 1 if memcached is enabled])
+        else
+	    AC_MSG_RESULT([no. Version 0.40 required])
+            if test "$memcached" != "default"; then
+	        AC_MSG_ERROR([libmemcached libraries missing])
+            fi
+        fi
+    else
+	AC_MSG_RESULT([no])
+        if test "$memcached" != "default"; then
+	    AC_MSG_ERROR([libmemcached libraries missing])
 	fi
     fi
 fi