X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=57511fef4dc78981bbe53b688ce7f34728fe26cc;hp=c9d338563466de626f2dfd6bd8cd6247f786ff8a;hb=30cfc59b71c25923e2e9cfb63c310c095bb3b6c1;hpb=51a57f063cc48f3343ab59f10aab92b80d424eaf

diff --git a/configure.in b/configure.in
index c9d3385..57511fe 100644
--- a/configure.in
+++ b/configure.in
@@ -1,33 +1,28 @@
 dnl YAZ Toolkit
-dnl (c) Index Data 1994-1998
+dnl (c) Index Data 1994-1999
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.5 1998-11-09 13:39:46 adam Exp $
-AC_INIT(include/yaz-version.h)
+dnl $Id: configure.in,v 1.12 1999-11-30 13:47:10 adam Exp $
+AC_INIT(include/yaz/yaz-version.h)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+dnl 
+dnl ----- Build root
+AC_SUBST(build_root)
+AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
 dnl
 dnl ----- YC: 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
-	ASNMODULE=asn
+AC_ARG_ENABLE(yc,[  --enable-yc             compile using YAZ' ASN.1 Compiler (YC)])
+if test "$enable_yc" = "yes"; then
+	ASNMODULE="z39.50"
+	cp -f include/yaz/z-proto.h include/yaz/proto.h
 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
+	ASNMODULE=asn
+	cp -f include/yaz/prt-proto.h include/yaz/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -43,6 +38,34 @@ if test "$checkBoth" = "1"; then
 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"])
+if test "$ac_cv_lib_readline_readline" = "yes"; then
+	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+fi
+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
 if test "$ac_cv_header_stdc" = "no"; then
@@ -50,9 +73,8 @@ 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_ARG_ENABLE(threads, [  --enable-threads        enable threads if available])
+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
@@ -62,4 +84,4 @@ if test "$threads_ok" = "yes"; then
 fi
 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)
+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)