projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added member request_format and output_format for backend fetch method.
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
ae77ec4
..
187db9f
100644
(file)
--- 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 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.30 2000-07-06 10:38:47 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 1.7)
dnl
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
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
@@
-32,7
+32,7
@@
else
fi
AC_MSG_CHECKING(whether proto.h needs to be generated)
yaz_include=${srcdir}/include/yaz
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)
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
@@
-53,32
+53,40
@@
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl
dnl ------ GNU Readline
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
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
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
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
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" != "no"; then
oldLibs=$LIBS
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>
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;
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
if test "$tcpd_ok" = "0"; then
AC_MSG_RESULT(no)
LIBS=$oldLibs
+ CPPFLAGS=$oldCPPFLAGS
else
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_TCPD_H)
else
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_TCPD_H)
@@
-116,4
+124,23
@@
AC_SUBST(SUBDIRS_VAR)
dnl
dnl ------ Makefiles
dnl
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])