]>
Commit | Line | Data |
---|---|---|
1 | --- yaz-2.0/configure.in.orig Sun Feb 23 21:18:04 2003 | |
2 | +++ yaz-2.0/configure.in Tue Mar 11 11:51:10 2003 | |
3 | @@ -232,6 +232,7 @@ | |
4 | dnl | |
5 | dnl ------ tcpd | |
6 | AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) | |
7 | +WRAPLIBS="" | |
8 | if test "$enable_tcpd" != ""; then | |
9 | oldLibs=$LIBS | |
10 | oldCPPFLAGS=$CPPFLAGS | |
11 | @@ -240,7 +241,7 @@ | |
12 | CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include" | |
13 | fi | |
14 | AC_MSG_CHECKING(for working tcpd.h) | |
15 | - LIBS="$LIBS -lwrap -lnsl" | |
16 | + LIBS="$LIBS -lwrap" | |
17 | AC_TRY_LINK([#include <syslog.h> | |
18 | #include <tcpd.h> | |
19 | int allow_severity = LOG_INFO; | |
20 | @@ -250,13 +251,15 @@ | |
21 | tcpd_ok=1, tcpd_ok=0) | |
22 | if test "$tcpd_ok" = "0"; then | |
23 | AC_MSG_RESULT(no) | |
24 | - LIBS=$oldLibs | |
25 | CPPFLAGS=$oldCPPFLAGS | |
26 | else | |
27 | AC_MSG_RESULT(yes) | |
28 | AC_DEFINE(HAVE_TCPD_H) | |
29 | + WRAPLIBS="-lwrap" | |
30 | fi | |
31 | + LIBS=$oldLibs | |
32 | fi | |
33 | +AC_SUBST(WRAPLIBS) | |
34 | dnl | |
35 | dnl ------ Headers | |
36 | AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h) | |
37 | --- yaz-2.0/server/Makefile.am.orig Tue Feb 18 09:08:02 2003 | |
38 | +++ yaz-2.0/server/Makefile.am Tue Mar 11 11:51:43 2003 | |
39 | @@ -5,6 +5,8 @@ | |
40 | libserver_la_SOURCES = eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \ | |
41 | eventl.h service.h session.h | |
42 | ||
43 | +LIBS = $(WRAPLIBS) | |
44 | + | |
45 | EXTRA_DIST=service.c | |
46 | ||
47 | AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) -DDOCDIR=\"$(datadir)/doc/$(PACKAGE)\" |