summaryrefslogtreecommitdiffstats
path: root/drivers/staging/usbip
diff options
context:
space:
mode:
authorW. Trevor King2012-08-17 12:47:05 +0200
committerGreg Kroah-Hartman2012-08-17 18:44:04 +0200
commitce591f76c79da49389091a2f62597c88b8a29374 (patch)
treed8f031a7418fdee3f40ab6ed25fb757496f5ce55 /drivers/staging/usbip
parentstaging: usbip: export usbip_debug_flag as a usbip-core module parameter. (diff)
downloadkernel-qcow2-linux-ce591f76c79da49389091a2f62597c88b8a29374.tar.gz
kernel-qcow2-linux-ce591f76c79da49389091a2f62597c88b8a29374.tar.xz
kernel-qcow2-linux-ce591f76c79da49389091a2f62597c88b8a29374.zip
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>
Diffstat (limited to 'drivers/staging/usbip')
-rw-r--r--drivers/staging/usbip/userspace/configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
index bf5cf49cb554..43e641e5ac06 100644
--- 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])