]>
Commit | Line | Data |
---|---|---|
c9afc058 JB |
1 | --- yaz-2.0.28/configure.in.orig 2004-11-09 21:35:30.000000000 +0100 |
2 | +++ yaz-2.0.28/configure.in 2004-11-22 23:41:13.606211824 +0100 | |
3 | @@ -206,6 +206,7 @@ | |
97b8a8b3 JB |
4 | dnl |
5 | dnl ------ tcpd | |
6 | AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) | |
52319978 | 7 | +WRAPLIBS="" |
c9afc058 | 8 | if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then |
97b8a8b3 JB |
9 | oldLibs=$LIBS |
10 | oldCPPFLAGS=$CPPFLAGS | |
c9afc058 | 11 | @@ -214,7 +215,7 @@ |
97b8a8b3 JB |
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; | |
c9afc058 | 20 | @@ -225,13 +226,15 @@ |
97b8a8b3 JB |
21 | if test "$tcpd_ok" = "0"; then |
22 | AC_MSG_RESULT(no) | |
c9afc058 | 23 | AC_MSG_ERROR([tcpd development libraries missing]) |
97b8a8b3 JB |
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 | |
52319978 | 36 | AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h) |
538fde33 JB |
37 | --- yaz-2.0.6/src/Makefile.am.orig 2003-10-27 13:21:30.000000000 +0100 |
38 | +++ yaz-2.0.6/src/Makefile.am 2003-12-07 11:14:22.779872136 +0100 | |
39 | @@ -64,6 +64,7 @@ | |
40 | eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \ | |
41 | eventl.h service.c service.h session.h | |
42 | libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO) | |
43 | +libyaz_la_LIBADD=$(WRAPLIBS) | |
97b8a8b3 | 44 | |
538fde33 JB |
45 | libyazthread_la_SOURCES= |
46 | libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo |