X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=3d5da611c7913f0dd068538b204faf93bb65e7cd;hb=2b85787ba94cfbc6cd1123e9773802aee6740ca5;hp=342eb4180a7eeacd14ac49208af4b3e37f0b42b8;hpb=c066a043f79860daf37234db3509156a3fc9205f;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 342eb41..3d5da61 100644
--- a/configure.in
+++ b/configure.in
@@ -1,33 +1,43 @@
 dnl YAZ Toolkit
-dnl (c) Index Data 1994-1998
+dnl (c) Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.6 1999-03-11 11:12:07 adam Exp $
-AC_INIT(include/yaz-version.h)
+dnl $Id: configure.in,v 1.27 2000-05-02 19:32:15 adam Exp $
+AC_INIT(include/yaz/yaz-version.h)
+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
-dnl
-dnl ----- YC: The Yaz Compiler
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
+dnl 
+dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
-AC_ARG_WITH(yc,[  --with-yc               compile using YC: The Yaz Compiler], [YCDIR=$withval],[YCDIR=""])
-
-if test "$YCDIR" = "yes"; then
-	YCDIR="../yc"
-fi
-if test -d z39.50; then
-	rm z39.50
-fi
-if test "$YCDIR" = ""; 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"
+	ILLMODULE="ill"
+	ILLLIB=../ill/libill.la
+	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
+	HFILE=z-proto.h
+else
+	ILLMODULE=""
 	ASNMODULE=asn
+	ILLLIB=""
+	ASN_MAKEFILES="asn/Makefile"
+	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
-	if test ! -d "$YCDIR"; then
-		AC_MSG_WARN(YC directory ${YCDIR} doesn't exist)
-	fi
-	ln -s ${YCDIR}/z39.50 z39.50
-	ASNMODULE=z39.50
+	AC_MSG_RESULT(yes)
+	cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -44,11 +54,38 @@ 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"])
-AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+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, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
+fi
+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)
+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 -lnsl"
+	AC_TRY_LINK([#include <syslog.h>
+	#include <tcpd.h>
+	int allow_severity = LOG_INFO;
+	int deny_severity = LOG_WARNING;],
+	[struct request_info request_info; int i;
+	i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
+	if test "$tcpd_ok" = "0"; then
+		AC_MSG_RESULT(no)
+		LIBS=$oldLibs
+	else
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_TCPD_H)
+	fi
+fi
 dnl
 dnl ------ Headers
 AC_STDC_HEADERS
@@ -57,16 +94,28 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available],
-    [threads_ok=$enableval], [threads_ok=no])
-if test "$threads_ok" = "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_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
+if test "$enable_threads" = "yes"; then
+	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 asn/Makefile odr/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)