Win32/64 split. Use ICU compiled with VS2015

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

diff --git a/configure.ac b/configure.ac
index 7ceddfe..8d7e03b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,8 @@ 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
@@ -26,7 +27,8 @@ 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_C_BIGENDIAN
+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,44 +62,12 @@ 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 ------ 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
-    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
-           libgcryptversion=""
-       fi
-    else
-       AC_MSG_RESULT([no])
-    fi
-fi
+dnl
 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
+if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE"; then
     AC_CHECK_LIB([hiredis],[redisCommandArgv],[HIREDIS_LIBS=-lhiredis])
     AC_MSG_CHECKING([for redis])
     if $pkgconfigpath --cflags hiredis >/dev/null 2>&1 ; then
@@ -128,7 +98,7 @@ 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" -a "$pkgconfigpath" != "NONE"; then
+if test "$memcached" != "no" -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
@@ -149,6 +119,9 @@ if test "$memcached" != "no" -a -n "$libgcryptversion" -a "$pkgconfigpath" != "N
        fi
     fi
 fi
+dnl
+dnl
+dnl
 dnl ------ GNU TLS
 AC_SUBST([SSL_CFLAGS])
 AC_SUBST([SSL_LIBS])