[systemd-devel] [PATCH] build: change tcpwrappers support to disabled by default

[Cristian Rodríguez]

The underlying components have not seen any upstream activity
since 1997 and are not particulary nice either.

Those interested in computer archeology can explicitly use --enable-tcpwrap
---
 configure.ac | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3ced6cf..6859510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -432,28 +432,22 @@ AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"])
 
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([tcpwrap],
-        AS_HELP_STRING([--disable-tcpwrap],[Disable optional TCP wrappers support]),
+        AS_HELP_STRING([--enable-tcpwrap],[Enable optional TCP wrappers support]),
                 [case "${enableval}" in
                         yes) have_tcpwrap=yes ;;
                         no) have_tcpwrap=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-tcpwrap) ;;
+                        *) AC_MSG_ERROR(bad value ${enableval} for --enable-tcpwrap) ;;
                 esac],
-                [have_tcpwrap=auto])
+                [have_tcpwrap=no])
 
-if test "x${have_tcpwrap}" != xno ; then
+AS_IF([test "x$have_tcpwrap" = "xyes" ], [
         ACX_LIBWRAP
-        if test "x${LIBWRAP_LIBS}" = x ; then
-                if test "x$have_tcpwrap" = xyes ; then
+        AS_IF([test "x${LIBWRAP_LIBS}" = "x"], [
+               AS_IF([test "x$have_tcpwrap" = "xyes"], [
                         AC_MSG_ERROR([*** TCP wrappers support not found.])
-                fi
-                have_tcpwrap=no
-        else
+                ], [
                 M4_DEFINES="$M4_DEFINES -DHAVE_LIBWRAP"
-                have_tcpwrap=yes
-        fi
-else
-        LIBWRAP_LIBS=
-fi
+                have_tcpwrap=yes])])], [LIBWRAP_LIBS=])
 AC_SUBST(LIBWRAP_LIBS)
 
 # ------------------------------------------------------------------------------
-- 
1.8.4.5