X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=6c785e6d2e956f805937ecde016aaf7722ea66b3;hb=162d5852cbb7881d8edae6648fbdc888d1cfe0c6;hp=221b17415a4df7c8f486755b45cca20b8c400ee5;hpb=5aaf79c4e4fbf5c5f17f136646e1933b5c989b7d;p=yaz-moved-to-github.git diff --git a/configure.ac b/configure.ac index 221b174..6c785e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1995-2007 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.88 2007-07-10 14:28:37 adam Exp $ +dnl $Id: configure.ac,v 1.101 2007-12-30 22:04:12 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yaz],[3.0.9],[yaz-help@indexdata.dk]) +AC_INIT([yaz],[3.0.18],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.8]) @@ -14,7 +14,7 @@ AC_PROG_CC AC_PROG_CPP AC_CHECK_PROGS(YACC, 'bison -y') test -z "$YACC" && AC_MSG_WARN([GNU bison not found]) -AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh) +AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh]) AC_PROG_INSTALL AM_PROG_LIBTOOL AC_PATH_PROG(pkgconfigpath, pkg-config, NONE) @@ -209,7 +209,7 @@ fi AC_MSG_CHECKING([for libpcap (required for ziffy)]) if test -z "${PCAP_LIBS}"; then AC_MSG_RESULT([not found. ziffy disabled]) - if test "${PCAP_LIBS}"; then + if test "${PCAP_DIR}" = "yes"; then AC_MSG_ERROR([libpcap missing]) fi else @@ -313,9 +313,10 @@ fi dnl AC_SUBST(YAZ_CONFIG_CFLAGS) dnl -HAVETHREADS=0 -dnl +dnl +AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"]) dnl ------ GNU threads +HAVETHREADS=0 AC_ARG_ENABLE(pth, [ --enable-pth enable GNU threads],[enable_pth=$enableval],[enable_pth=no]) AC_SUBST(LIBPTH) if test "$enable_pth" = "yes"; then