X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=58ebe0b93d9c9ea190f3771c84496761f30292ea;hb=91bd424e18017a225bc500e5ac94f71382a6a03f;hp=3551f37c714f528a7034c4176658c14e169a1935;hpb=04bb1765f48598e0a1c271c10980352f698f5046;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 3551f37..58ebe0b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,33 @@
 dnl YAZ Toolkit
-dnl (c) Index Data 1994-1999
+dnl (c) Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.11 1999-06-09 14:23:58 adam Exp $
-AC_INIT(include/yaz-version.h)
+dnl $Id: configure.in,v 1.24 2000-03-14 09:06:11 adam Exp $
+AC_INIT(include/yaz/yaz-version.h)
+AM_INIT_AUTOMAKE(yaz, 1.6)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-dnl
-dnl ----- YC: The Yaz Compiler
+dnl 
+dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
-AC_ARG_ENABLE(yc,[  --enable-yc             compile using YAZ' ASN.1 Compiler (YC)])
-if test "$enable_yc" = "yes"; then
+AC_SUBST(ILLMODULE)
+AC_SUBST(ILLLIB)
+AC_ARG_ENABLE(comp,[  --disable-comp          use old encoders, i.e. disable the YAZ ASN.1 Compiler], , enable_comp=yes)
+if test "$enable_comp" = "yes"; then
 	ASNMODULE="z39.50"
-	cp -f include/z-proto.h include/proto.h
+	ILLMODULE="ill"
+	ILLLIB=../ill/libill.a
+	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
+	cp -f include/yaz/z-proto.h include/yaz/proto.h
 else
+	ILLMODULE=""
 	ASNMODULE=asn
-	cp -f include/prt-proto.h include/proto.h
+	ILLLIB=""
+	ASN_MAKEFILES="asn/Makefile"
+	cp -f include/yaz/prt-proto.h include/yaz/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -36,17 +45,22 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ GNU Readline
 AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
+if test "$ac_cv_lib_readline_readline" = "no"; then
+	AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline -ltermcap"])
+fi
 AC_CHECK_LIB(history, add_history, [LIBS="$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)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])
 if test "$enable_tcpd" = "yes"; then
 	AC_MSG_CHECKING(for working tcpd.h)
 	oldLibs=$LIBS
-	LIBS="$LIBS -lwrap"
+	LIBS="$LIBS -lwrap -lnsl"
 	AC_TRY_LINK([#include <syslog.h>
 	#include <tcpd.h>
 	int allow_severity = LOG_INFO;
@@ -69,15 +83,28 @@ 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"
+AC_SUBST(SUBDIRS_VAR)
+dnl
 dnl ------ Makefiles
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile)
+dnl
+AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile)