From: Neil Brown Date: Mon, 5 Feb 2007 00:56:07 +0000 (+1100) Subject: Enable tcpwrappers by default X-Git-Tag: nfs-utils-1-0-11~20 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f6fe44968591845a6c9be0b606e3d159415e8d33;p=nfs-utils.git Enable tcpwrappers by default This used to be the default but we lost it at about 1.0.8 --- diff --git a/aclocal/tcp-wrappers.m4 b/aclocal/tcp-wrappers.m4 index 314a667..0fdf611 100644 --- a/aclocal/tcp-wrappers.m4 +++ b/aclocal/tcp-wrappers.m4 @@ -4,29 +4,29 @@ AC_DEFUN([AC_TCP_WRAPPERS],[ AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], - [ - if test "x$withval" != "xno" ; then + with_tcpw=$withval, $with_tcpw=yes) + if test "x$with_tcpw" != "xno" ; then saved_LIBS="$LIBS" saved_LDFLAGS="$LDFLAGS" saved_CPPFLAGS="$CPPFLAGS" - if test -n "${withval}" -a "${withval}" != "yes"; then - if test -d "${withval}/lib"; then + if test -n "${with_tcpw}" -a "${with_tcpw}" != "yes"; then + if test -d "${with_tcpw}/lib"; then if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" + LDFLAGS="-L${with_tcpw}/lib -R${with_tcpw}/lib ${LDFLAGS}" else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" + LDFLAGS="-L${with_tcpw}/lib ${LDFLAGS}" fi else if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" + LDFLAGS="-L${with_tcpw} -R${with_tcpw} ${LDFLAGS}" else - LDFLAGS="-L${withval} ${LDFLAGS}" + LDFLAGS="-L${with_tcpw} ${LDFLAGS}" fi fi - if test -d "${withval}/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + if test -d "${with_tcpw}/include"; then + CPPFLAGS="-I${with_tcpw}/include ${CPPFLAGS}" else - CPPFLAGS="-I${withval} ${CPPFLAGS}" + CPPFLAGS="-I${with_tcpw} ${CPPFLAGS}" fi fi LIBWRAP="-lwrap" @@ -48,8 +48,6 @@ AC_DEFUN([AC_TCP_WRAPPERS],[ ]) LIBS="$saved_LIBS" fi - ] - ) AC_SUBST(LIBWRAP) AC_SUBST(HAVE_LIBWRAP) AC_SUBST(HAVE_TCP_WRAPPER)