From 99f1879827d5be93a6363b5adbc83b824135dd88 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 28 Apr 2010 15:38:47 +0200 Subject: [PATCH] TCPD libs only used in libyaz's LIBADD 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 | 6 ++++-- src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5bf8c8e..7570d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 00d897a..46e2e50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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) -- 1.7.10.4