-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.184 2005-08-25 12:44:24 adam Exp $
+dnl $Id: configure.in,v 1.193 2006-03-16 08:36:29 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.1.9)
+AM_INIT_AUTOMAKE(yaz, 2.1.15)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
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)
])
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
fi
fi
dnl
-AC_SUBST(LIBTHREAD)
-AC_SUBST(CFLAGSTHREADS)
+AC_SUBST(THREAD_CFLAGS)
HAVETHREADS=0
-CFLAGSTHREADS=""
+THREAD_CFLAGS=""
LIBTHREAD=""
dnl
dnl ------ GNU threads
AC_CHECK_HEADERS(pth.h)
if test "$ac_cv_header_pth_h" = "yes"; then
LIBTHREAD="-lpth"
- CFLAGSTHREADS="-DYAZ_GNU_THREADS=1"
+ THREAD_CFLAGS="-DYAZ_GNU_THREADS=1"
HAVETHREADS=1
fi
fi
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
dnl
dnl ------ POSIX Threads
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT(yes)
LIBTHREAD="-lpthread"
- CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ THREAD_CFLAGS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
HAVETHREADS=1
else
CC="$CC -pthread"
thread_ok=yes,thread_ok=no)
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT([yes,BSD])
- CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ THREAD_CFLAGS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
LIBTHREAD="-pthread"
HAVETHREADS=1
fi
AC_MSG_RESULT(no)
fi
CC=$OCC
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
-AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
dnl
dnl ----- libXML2
AC_SUBST(XML2_LIBS)