diff options
| author | Neil Brown <neilb@suse.de> | 2007-02-05 11:56:07 +1100 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-02-05 11:56:07 +1100 |
| commit | f6fe44968591845a6c9be0b606e3d159415e8d33 (patch) | |
| tree | 07c7525ffb0ec4ba18355a10b0a9225f21a0eb65 /aclocal/tcp-wrappers.m4 | |
| parent | 20c2deec22dea092ee309b6a30f94c048b83d1d1 (diff) | |
| download | nfs-utils-f6fe44968591845a6c9be0b606e3d159415e8d33.tar.gz | |
Enable tcpwrappers by default
This used to be the default but we lost it at about 1.0.8
Diffstat (limited to 'aclocal/tcp-wrappers.m4')
| -rw-r--r-- | aclocal/tcp-wrappers.m4 | 24 |
1 files changed, 11 insertions, 13 deletions
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) |