X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=c596f72d76b995a3b79bb092f176d59a1bc6f665;hp=8ef93c0a030c49ed3758f2b65bf02e8ee1b2528d;hb=2aac1412b1bfe2b6d96b72b254a0292d5e5ee056;hpb=79b822d1cd0f781768924c32e1fdc1b210e7c368

diff --git a/configure.in b/configure.in
index 8ef93c0..c596f72 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2005
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.173 2005-03-14 11:17:58 adam Exp $
+dnl $Id: configure.in,v 1.186 2005-09-16 21:44:23 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.1.0)
+AM_INIT_AUTOMAKE(yaz, 2.1.9)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -160,7 +160,7 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r usleep)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi
@@ -244,10 +244,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 +259,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 +282,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 +294,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 +303,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 +329,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 +368,6 @@ zoom/Makefile
 doc/Makefile
 doc/yaz.xml
 doc/yazhtml.dsl
-doc/yazphp.dsl
 doc/yazprint.dsl
 doc/tkl.xsl
 doc/yazhtml.xsl