]>
Commit | Line | Data |
---|---|---|
790ca7bf JB |
1 | --- yaz-2.1.22/configure.ac.orig 2006-06-15 15:38:05.000000000 +0200 |
2 | +++ yaz-2.1.22/configure.ac 2006-07-22 15:39:52.050565250 +0200 | |
3 | @@ -231,6 +231,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 |
790ca7bf JB |
9 | oldLibs=$LIBS |
10 | oldCPPFLAGS=$CPPFLAGS | |
11 | @@ -239,7 +240,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> | |
97b8a8b3 | 18 | #include <tcpd.h> |
790ca7bf JB |
19 | int allow_severity = LOG_INFO; |
20 | @@ -255,8 +256,11 @@ | |
21 | else | |
22 | AC_MSG_RESULT(yes) | |
23 | AC_DEFINE(HAVE_TCPD_H) | |
24 | + WRAPLIBS="-lwrap" | |
25 | fi | |
26 | + LIBS=$oldLibs | |
97b8a8b3 JB |
27 | fi |
28 | +AC_SUBST(WRAPLIBS) | |
29 | dnl | |
790ca7bf JB |
30 | AC_SUBST(THREAD_CFLAGS) |
31 | HAVETHREADS=0 | |
538fde33 JB |
32 | --- yaz-2.0.6/src/Makefile.am.orig 2003-10-27 13:21:30.000000000 +0100 |
33 | +++ yaz-2.0.6/src/Makefile.am 2003-12-07 11:14:22.779872136 +0100 | |
34 | @@ -64,6 +64,7 @@ | |
35 | eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \ | |
36 | eventl.h service.c service.h session.h | |
37 | libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO) | |
38 | +libyaz_la_LIBADD=$(WRAPLIBS) | |
97b8a8b3 | 39 | |
538fde33 JB |
40 | libyazthread_la_SOURCES= |
41 | libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo |