X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c6851e2ac3770e785cedce3d0a3bbd9c15d3e96e;hb=d4981d86af4a523288d1eadca634b83fad0f37e8;hp=4745ad3e1442562f338f995766397895de556efd;hpb=455798a3154b5c08c872ca0fb90607ddea575038;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 4745ad3..c6851e2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2005
+dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.185 2005-09-09 10:34:09 adam Exp $
+dnl $Id: configure.in,v 1.192 2006-03-14 09:04:07 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.1.9)
+AM_INIT_AUTOMAKE(yaz, 2.1.14)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -21,7 +21,7 @@ YAZ_DOC
 dnl 
 dnl
 dnl ------ Headers
-AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/poll.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
+AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
 AC_HEADER_STDC
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
@@ -160,8 +160,17 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r usleep fopen64)
-if test "$ac_cv_func_poll" = "yes"; then
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
+case $host in
+*-*-darwin*)
+	trypoll="no";
+		;;
+*)
+	trypoll="yes";
+	;;
+esac
+
+if test "$ac_cv_func_poll" = "yes" -a "$trypoll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi
 dnl ------ socklen_t