X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=b88f4008818a1c4cac944fac538805b92b45699c;hb=fa21652860bfd374c3fa9adee83ad726bffd6dbd;hp=ae77ec47aa71535ef08568231dfb47e2b7e8ef38;hpb=7acd51b7cdffca5ad92a777d2c6e8e9bae1f9fd3;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index ae77ec4..b88f400 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
-dnl YAZ Toolkit
-dnl (c) Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.25 2000-04-05 07:39:54 adam Exp $
+dnl $Id: configure.in,v 1.34 2000-10-03 12:55:50 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
@@ -29,10 +29,13 @@ else
 	ILLLIB=""
 	ASN_MAKEFILES="asn/Makefile"
 	HFILE=prt-proto.h
+	if ! test -r include/yaz/prt-rsc.h ; then
+		cp asn/*.h include/yaz
+	fi
 fi
 AC_MSG_CHECKING(whether proto.h needs to be generated)
 yaz_include=${srcdir}/include/yaz
-if test -e ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
 	AC_MSG_RESULT(no)
 else
 	AC_MSG_RESULT(yes)
@@ -53,32 +56,40 @@ 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"])
+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, [LIBS="$LIBS -lreadline -ltermcap"])
+	AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
 fi
-AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+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)
+AC_CHECK_FUNCS(vsnprintf gettimeofday)
 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)
+AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
+if test "$enable_tcpd" != ""; then
 	oldLibs=$LIBS
+	oldCPPFLAGS=$CPPFLAGS
+	if test "$enable_tcpd" != "yes"; then
+		LIBS="$LIBS -L$enable_tcpd/lib"
+		CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
+	fi
+	AC_MSG_CHECKING(for working tcpd.h)
 	LIBS="$LIBS -lwrap -lnsl"
 	AC_TRY_LINK([#include <syslog.h>
-	#include <tcpd.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)
+	i = hosts_access(&request_info);],
+	tcpd_ok=1, tcpd_ok=0)
 	if test "$tcpd_ok" = "0"; then
 		AC_MSG_RESULT(no)
 		LIBS=$oldLibs
+		CPPFLAGS=$oldCPPFLAGS
 	else
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_TCPD_H)
@@ -92,7 +103,7 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
+AC_ARG_ENABLE(threads, [  --enable-threads        enable POSIX threads],[enable_threads=$enableval],[enable_threads=no])
 if test "$enable_threads" = "yes"; then
 	AC_CHECK_LIB(pthread,main)
 	AC_MSG_CHECKING(for working POSIX Threads)
@@ -110,10 +121,33 @@ if test "$enable_threads" = "yes"; then
 		AC_MSG_RESULT(no)
 	fi
 fi
+dnl ------ Using this for "in-source" yaz-config
+AC_SUBST(YAZ_SRC_ROOT)
+YAZ_SRC_ROOT=`pwd`
 dnl
 SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl
 dnl ------ Makefiles
 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)
+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
+yaz-config
+lib/yaz-config],[chmod +x lib/yaz-config yaz-config])