X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=5d1792668f12ec902586802bd511541b9a709b68;hb=c3f57c8345a7f18e072352e65e20b895a0011787;hp=0b07849d266b4b57eeacb79eeda37344b2ae812f;hpb=2059ba0c9ca49689d20c7687195c30d06cbb4cf9;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 0b07849..5d17926 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,17 @@
 dnl YAZ Toolkit
 dnl (c) Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.23 2000-03-10 08:41:30 adam Exp $
+dnl $Id: configure.in,v 1.28 2000-05-18 11:57:04 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.6)
+AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
+AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-AC_PROG_RANLIB
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
 dnl 
 dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
@@ -19,15 +21,23 @@ AC_ARG_ENABLE(comp,[  --disable-comp          use old encoders, i.e. disable the
 if test "$enable_comp" = "yes"; then
 	ASNMODULE="z39.50"
 	ILLMODULE="ill"
-	ILLLIB=../ill/libill.a
+	ILLLIB=../ill/libill.la
 	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
-	cp -f include/yaz/z-proto.h include/yaz/proto.h
+	HFILE=z-proto.h
 else
 	ILLMODULE=""
 	ASNMODULE=asn
 	ILLLIB=""
 	ASN_MAKEFILES="asn/Makefile"
-	cp -f include/yaz/prt-proto.h include/yaz/proto.h
+	HFILE=prt-proto.h
+fi
+AC_MSG_CHECKING(whether proto.h needs to be generated)
+yaz_include=${srcdir}/include/yaz
+if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+	AC_MSG_RESULT(no)
+else
+	AC_MSG_RESULT(yes)
+	cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -44,14 +54,17 @@ fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ GNU Readline
-AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
+READLINE_LIBS=""
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
 if test "$ac_cv_lib_readline_readline" = "no"; then
-	AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline -ltermcap"])
+	AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
 fi
-AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
 	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
 fi
+dnl ------ snprintf
+AC_CHECK_FUNCS(vsnprintf gettimeofday)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])
@@ -81,14 +94,23 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available])
+AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes"; then
-	AC_CHECK_HEADERS(pthread.h threads.h)
-	AC_CHECK_FUNC(pthread_mutex_lock)
-	if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
-		AC_CHECK_LIB(pthread, main)
+	AC_CHECK_LIB(pthread,main)
+	AC_MSG_CHECKING(for working POSIX Threads)
+	AC_TRY_LINK([#include <pthread.h>
+	int func(void *p) { return 0; }
+	],[
+	pthread_t pthread_id;
+	int r = pthread_create (&pthread_id, 0, func, 0);],
+		thread_ok=yes,thread_ok=no)
+	if test "$thread_ok" = "yes"; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_PTHREAD_H)
+		AC_DEFINE(_REENTRANT)
+	else
+		AC_MSG_RESULT(no)
 	fi
-	AC_DEFINE(_REENTRANT)
 fi
 dnl
 SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"