diff options
author | W. Trevor King <wking@tremily.us> | 2012-08-17 06:47:05 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-17 12:44:04 -0400 |
commit | ce591f76c79da49389091a2f62597c88b8a29374 (patch) | |
tree | d8f031a7418fdee3f40ab6ed25fb757496f5ce55 | |
parent | 93efc55b42536273d8ca5cccb5261cfe5e1471bb (diff) |
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>
-rw-r--r-- | drivers/staging/usbip/userspace/configure.ac | 12 |
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], | |||
56 | [AS_HELP_STRING([--with-tcp-wrappers], | 56 | [AS_HELP_STRING([--with-tcp-wrappers], |
57 | [use the libwrap (TCP wrappers) library])], | 57 | [use the libwrap (TCP wrappers) library])], |
58 | dnl [ACTION-IF-GIVEN] | 58 | dnl [ACTION-IF-GIVEN] |
59 | [saved_LIBS="$LIBS" | 59 | [if test "$withval" = "yes"; then |
60 | if test "$withval" = "yes"; then | ||
61 | AC_MSG_RESULT([yes]) | 60 | AC_MSG_RESULT([yes]) |
62 | AC_MSG_CHECKING([for hosts_access in -lwrap]) | 61 | AC_MSG_CHECKING([for hosts_access in -lwrap]) |
63 | LIBS="-lwrap $LIBS" | 62 | saved_LIBS="$LIBS" |
63 | LIBS="-lwrap $saved_LIBS" | ||
64 | AC_TRY_LINK( | 64 | AC_TRY_LINK( |
65 | [int hosts_access(); int allow_severity, deny_severity;], | 65 | [int hosts_access(); int allow_severity, deny_severity;], |
66 | [hosts_access()], | 66 | [hosts_access()], |
@@ -69,9 +69,9 @@ AC_ARG_WITH([tcp-wrappers], | |||
69 | [use tcp wrapper]) wrap_LIB="-lwrap"], | 69 | [use tcp wrapper]) wrap_LIB="-lwrap"], |
70 | [AC_MSG_RESULT([not found]); exit 1]) | 70 | [AC_MSG_RESULT([not found]); exit 1]) |
71 | else | 71 | else |
72 | AC_MSG_RESULT([no]) | 72 | AC_MSG_RESULT([no]); |
73 | fi | 73 | LIBS="$saved_LIBS" |
74 | LIBS="$saved_LIBS"], | 74 | fi], |
75 | dnl [ACTION-IF-NOT-GIVEN] | 75 | dnl [ACTION-IF-NOT-GIVEN] |
76 | [AC_MSG_RESULT([(default)]) | 76 | [AC_MSG_RESULT([(default)]) |
77 | AC_MSG_CHECKING([for hosts_access in -lwrap]) | 77 | AC_MSG_CHECKING([for hosts_access in -lwrap]) |