X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=bde016ac60e5cc7e1390ee6378e959bd6bf10cd7;hb=a407bd021d8ea49257cf119e409a8c1e94e6fc25;hp=c2a5bbf8478fbd7046bff5234c92fce650a618ca;hpb=bf7ee634e855d15e955d06e7b225d2045abd518a;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index c2a5bbf..bde016a 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl YAZ Toolkit dnl (c) Index Data 1994-1999 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.7 1999-04-16 14:45:55 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 @@ -13,21 +13,12 @@ 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 + ASNMODULE="z39.50" + cp -f include/z-proto.h include/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/prt-proto.h include/proto.h fi dnl dnl ----- Sockets @@ -51,8 +42,22 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then fi dnl dnl ------ tcpd -AC_CHECK_LIB(wrap, main, [LIBS="$LIBS -lwrap"]) -AC_CHECK_HEADERS(tcpd.h) +AC_MSG_CHECKING(for working tcpd.h) +oldLibs=$LIBS +LIBS="$LIBS -lwrap" +AC_TRY_LINK([#include +#include +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 @@ -73,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)