staging: usbip: userspace: allow `configure --with-tcp-wrappers`

When `--with-tcp-wrappers` is passed to `configure`, the previous code
always reset LIBS to $saved_LIBS, regardless of whether libwrap was
found or not.  The current code makes the `--with-tcp-wrappers` case
look more like the default case, and it only resets LIBS if libwrap
was not found.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
index bf5cf49cb554167b3cfc5626129054118f0f42a6..43e641e5ac0610cbc26d02bad98d2d97d5236077 100644 (file)
--- a/drivers/staging/usbip/userspace/configure.ac
+++ b/drivers/staging/usbip/userspace/configure.ac
@@ -56,11 +56,11 @@ AC_ARG_WITH([tcp-wrappers],
            [AS_HELP_STRING([--with-tcp-wrappers],
                            [use the libwrap (TCP wrappers) library])],
            dnl [ACTION-IF-GIVEN]
-           [saved_LIBS="$LIBS"
-            if test "$withval" = "yes"; then
+           [if test "$withval" = "yes"; then
                     AC_MSG_RESULT([yes])
                     AC_MSG_CHECKING([for hosts_access in -lwrap])
-                    LIBS="-lwrap $LIBS"
+                    saved_LIBS="$LIBS"
+                    LIBS="-lwrap $saved_LIBS"
                     AC_TRY_LINK(
                       [int hosts_access(); int allow_severity, deny_severity;],
                       [hosts_access()],
@@ -69,9 +69,9 @@ AC_ARG_WITH([tcp-wrappers],
                                  [use tcp wrapper]) wrap_LIB="-lwrap"],
                       [AC_MSG_RESULT([not found]); exit 1])
             else
-                    AC_MSG_RESULT([no])
-            fi
-            LIBS="$saved_LIBS"],
+                    AC_MSG_RESULT([no]);
+                    LIBS="$saved_LIBS"
+            fi],
            dnl [ACTION-IF-NOT-GIVEN]
            [AC_MSG_RESULT([(default)])
             AC_MSG_CHECKING([for hosts_access in -lwrap])