TCPD libs only used in libyaz's LIBADD
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 28 Apr 2010 13:38:47 +0000 (15:38 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 28 Apr 2010 13:39:30 +0000 (15:39 +0200)
The TCPD libs (wrappers) are no longer put in to the LIBS make
variable. This is to avoid a dependency on the libwrap development
library for libyaz4-dev.

configure.ac
src/Makefile.am

index 5bf8c8e..7570d2a 100644 (file)
@@ -299,16 +299,18 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
        [struct request_info request_info; int i;
            i = hosts_access(&request_info);],
        tcpd_ok=1, tcpd_ok=0)
+    LIBS=$oldLibs
     if test "$tcpd_ok" = "0"; then
        AC_MSG_RESULT([no])
        AC_MSG_ERROR([tcpd development libraries missing])
-               LIBS=$oldLibs
-               CPPFLAGS=$oldCPPFLAGS
+       CPPFLAGS=$oldCPPFLAGS
     else
+       TCPD_LIBS="-lwrap"
        AC_MSG_RESULT([yes])
        AC_DEFINE([HAVE_TCPD_H])
     fi
 fi
+AC_SUBST([TCPD_LIBS])
 dnl
 AC_SUBST([YAZ_CONFIG_CFLAGS])
 dnl
index 00d897a..46e2e50 100644 (file)
@@ -26,7 +26,7 @@ YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
 YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
-libyaz_la_LIBADD = $(SSL_LIBS)
+libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS)
 libyaz_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)