X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=5b585abd40d83bffd95670ce6e452dea553f4153;hp=059c33ebd9fee45c0e2a04aaa65b7a359748616a;hb=b4fcff7bb8f63cf5d1c6871ecffd9c474fd57dda;hpb=6215ff999c5f4c9ff2cc59ab99f794832ce30f1d

diff --git a/configure.in b/configure.in
index 059c33e..5b585ab 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.174 2005-03-16 21:30:22 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.2)
+AM_INIT_AUTOMAKE(yaz, 2.1.15)
 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)
-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
@@ -244,10 +253,9 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	fi
 fi
 dnl
-AC_SUBST(LIBTHREAD)
-AC_SUBST(CFLAGSTHREADS)
+AC_SUBST(THREAD_CFLAGS)
 HAVETHREADS=0
-CFLAGSTHREADS=""
+THREAD_CFLAGS=""
 LIBTHREAD=""
 dnl
 dnl ------ GNU threads
@@ -260,11 +268,11 @@ if test "$enable_pth" = "yes"; then
         	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
@@ -283,7 +291,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	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"
@@ -295,7 +303,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 			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
@@ -304,9 +312,8 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		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)
@@ -331,8 +338,11 @@ if test "$xml2dir" != "no"; then
 		AC_DEFINE(HAVE_XML2)
 	else
 		AC_MSG_RESULT([Not found])
-		if test "$xml2dir" != "default"; then
-		        AC_MSG_ERROR([libXML2 development libraries missing])
+		if test "$xml2dir" = "default"; then
+			AC_MSG_WARN([Libxml2 development libraries not found.])
+			AC_MSG_WARN([YAZ will NOT support SRW/SRU.])
+		else
+		        AC_MSG_ERROR([libXML2 development libraries not found.])
 		fi
 	fi
 fi
@@ -367,7 +377,6 @@ zoom/Makefile
 doc/Makefile
 doc/yaz.xml
 doc/yazhtml.dsl
-doc/yazphp.dsl
 doc/yazprint.dsl
 doc/tkl.xsl
 doc/yazhtml.xsl