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
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>
AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
fi
AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
+dnl
+dnl ------ nettle
+nettle=default
+AC_SUBST([NETTLE_LIBS])
+AC_ARG_WITH([nettle], [ --with-nettle Nettle library], [nettle=$withval])
+if test "$nettle" != "no"; then
+ AC_MSG_CHECKING([for nettle])
+ if $pkgconfigpath --cflags nettle >/dev/null 2>&1 ; then
+ if $pkgconfigpath --atleast-version 2.0 nettle; then
+ AC_MSG_RESULT([yes])
+ CFLAGS="$CFLAGS `$pkgconfigpath --cflags nettle`"
+ NETTLE_LIBS="`$pkgconfigpath --libs nettle`"
+ libgcryptversion=2enable
+ AC_DEFINE([HAVE_NETTLE],[1],[Define to 1 if nettle is enabled])
+ else
+ AC_MSG_RESULT([no. Version 2.0 required])
+ if test "$nettle" != "default"; then
+ AC_MSG_ERROR([nettle libraries missing])
+ fi
+ fi
+ else
+ AC_MSG_RESULT([no])
+ if test "$nettle" != "default"; then
+ AC_MSG_ERROR([nettle libraries missing])
+ fi
+ fi
+fi
+dnl
+dnl
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" != "no" -a -z "$libgcryptversion"; then
if test "$libgcryptpath" = "NONE"; then
AC_PATH_PROG([libgcrypt],[libgcrypt-config],[NONE])
elif test -x $libgcryptpath/libgcrypt-config; then
fi
fi
fi
+dnl
+dnl
+dnl
dnl ------ GNU TLS
AC_SUBST([SSL_CFLAGS])
AC_SUBST([SSL_LIBS])