Fix --disable-tcpd to really disable tcpd. Patch by Robin H. Johnson.

diff --git a/NEWS b/NEWS
index 4eaa901..7636914 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
 Possible compatibility problems with earlier versions marked with '*'.
 

+Fix --disable-tcpd to really disable tcpd. Patch by Robin H. Johnson.
+

 --- 2.0.19 2004/03/30
 
 Rename CHANGELOG to NEWS to follow GNU style packing.
 --- 2.0.19 2004/03/30
 
 Rename CHANGELOG to NEWS to follow GNU style packing.

diff --git a/configure.in b/configure.in
index c08df70..5f5d9d6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.

-dnl $Id: configure.in,v 1.135 2004-03-29 20:13:07 adam Exp $
+dnl $Id: configure.in,v 1.136 2004-04-17 08:24:03 adam Exp $

 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE

@@ -275,7 +275,7 @@ AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])

-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then

        oldLibs=$LIBS
        oldCPPFLAGS=$CPPFLAGS
        if test "$enable_tcpd" != "yes"; then
        oldLibs=$LIBS
        oldCPPFLAGS=$CPPFLAGS
        if test "$enable_tcpd" != "yes"; then