Fixed problem with proto.h.

[yaz-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index e5b33d5..bde016a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 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.4 1998-11-09 13:23:09 adam Exp $
+dnl $Id: configure.in,v 1.10 1999-06-08 13:11:55 adam Exp $
 AC_INIT(include/yaz-version.h)
 dnl
 dnl ------ Checking programs
@@ -12,22 +12,13 @@ AC_PROG_RANLIB
 dnl
 dnl ----- YC: The Yaz Compiler
 AC_SUBST(ASNMODULE)
-AC_ARG_WITH(yc,[  --with-yc               compile using YC: The Yaz Compiler], [YCDIR=$withval])
-
+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 -L z39.50; then
-       rm z39.50
-fi
-if test ! -d "$YCDIR"; then
-       AC_MSG_WARN(YC directory ${YCDIR} doesn't exist)
-fi
-if test "$YCDIR" = ""; then
-       ASNMODULE=asn
+       ASNMODULE="z39.50"
+       cp -f include/z-proto.h include/proto.h
 else
-       ln -s ${YCDIR}/z39.50 z39.50
-       ASNMODULE=z39.50
+       ASNMODULE=asn
+       cp -f include/prt-proto.h include/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -43,6 +34,31 @@ 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_MSG_CHECKING(for working tcpd.h)
+oldLibs=$LIBS
+LIBS="$LIBS -lwrap"
+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
+dnl
 dnl ------ Headers
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
@@ -62,4 +78,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)