X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=353b500d2490712770d8bad1b9400a645348159f;hb=188b39dc723e0011264f8bd8f4a07d65cf8ddb72;hp=81915a9e094f01769ae1673db90ffbec1cfbe5e9;hpb=ee0459ed35eb48fdbf8e221de1ef7d6d59a0b0ad;p=yaz-moved-to-github.git diff --git a/configure.in b/configure.in index 81915a9..353b500 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.26 2000-04-11 21:22:28 adam Exp $ +dnl $Id: configure.in,v 1.29 2000-06-19 09:49:35 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 @@ -53,16 +53,17 @@ 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]) @@ -116,4 +117,23 @@ 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 +lib/yaz-config],[chmod +x lib/yaz-config])