diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/curl-confopts.m4 | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 index 190ff00a7..9d4315626 100644 --- a/m4/curl-confopts.m4 +++ b/m4/curl-confopts.m4 @@ -21,7 +21,7 @@ #*************************************************************************** # File version for 'aclocal' use. Keep it a single number. -# serial 15 +# serial 16 dnl CURL_CHECK_OPTION_THREADED_RESOLVER dnl ------------------------------------------------- @@ -497,63 +497,63 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [ ]) -dnl CURL_CHECK_OPTION_WINBIND_NTLM_AUTH +dnl CURL_CHECK_OPTION_NTLM_WB dnl ------------------------------------------------- dnl Verify if configure has been invoked with option -dnl --enable-ntlm-auth or --disable-ntlm-auth, and -dnl set shell variable want_wb_ntlm_auth and -dnl want_wb_ntlm_auth_file as appropriate. - -AC_DEFUN([CURL_CHECK_OPTION_WINBIND_NTLM_AUTH], [ - AC_BEFORE([$0],[CURL_CHECK_WINBIND_NTLM_AUTH])dnl - OPT_WINBIND_NTLM_AUTH="default" - AC_ARG_ENABLE(wb-ntlm-auth, -AC_HELP_STRING([--enable-wb-ntlm-auth@<:@=FILE@:>@],[Enable NTLM delegation to winbind's ntlm_auth helper, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)]) -AC_HELP_STRING([--disable-wb-ntlm-auth],[Disable NTLM delegation to winbind's ntlm_auth helper]), - OPT_WINBIND_NTLM_AUTH=$enableval) - want_wb_ntlm_auth_file="/usr/bin/ntlm_auth" - case "$OPT_WINBIND_NTLM_AUTH" in +dnl --enable-ntlm-wb or --disable-ntlm-wb, and set +dnl shell variable want_ntlm_wb and want_ntlm_wb_file +dnl as appropriate. + +AC_DEFUN([CURL_CHECK_OPTION_NTLM_WB], [ + AC_BEFORE([$0],[CURL_CHECK_NTLM_WB])dnl + OPT_NTLM_WB="default" + AC_ARG_ENABLE(ntlm-wb, +AC_HELP_STRING([--enable-ntlm-wb@<:@=FILE@:>@],[Enable NTLM delegation to winbind's ntlm_auth helper, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)]) +AC_HELP_STRING([--disable-ntlm-wb],[Disable NTLM delegation to winbind's ntlm_auth helper]), + OPT_NTLM_WB=$enableval) + want_ntlm_wb_file="/usr/bin/ntlm_auth" + case "$OPT_NTLM_WB" in no) - dnl --disable-wb-ntlm-auth option used - want_wb_ntlm_auth="no" + dnl --disable-ntlm-wb option used + want_ntlm_wb="no" ;; default) dnl configure option not specified - want_wb_ntlm_auth="yes" + want_ntlm_wb="yes" ;; *) - dnl --enable-wb-ntlm-auth option used - want_wb_ntlm_auth="yes" + dnl --enable-ntlm-wb option used + want_ntlm_wb="yes" if test -n "$enableval" && test "$enableval" != "yes"; then - want_wb_ntlm_auth_file="$enableval" + want_ntlm_wb_file="$enableval" fi ;; esac ]) -dnl CURL_CHECK_WINBIND_NTLM_AUTH +dnl CURL_CHECK_NTLM_WB dnl ------------------------------------------------- -dnl Check if winbind's ntlm_auth helper support will -dnl finally be enabled depending on configure option -dnl given and target platform. +dnl Check if support for NTLM delegation to winbind's +dnl ntlm_auth helper will finally be enabled depending +dnl on given configure options and target platform. -AC_DEFUN([CURL_CHECK_WINBIND_NTLM_AUTH], [ - AC_REQUIRE([CURL_CHECK_OPTION_WINBIND_NTLM_AUTH])dnl +AC_DEFUN([CURL_CHECK_NTLM_WB], [ + AC_REQUIRE([CURL_CHECK_OPTION_NTLM_WB])dnl AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl AC_MSG_CHECKING([whether to enable NTLM delegation to winbind's helper]) if test "$ac_cv_native_windows" = "yes" || test "x$SSL_ENABLED" = "x"; then - want_wb_ntlm_auth_file="" - want_wb_ntlm_auth="no" + want_ntlm_wb_file="" + want_ntlm_wb="no" fi - AC_MSG_RESULT([$want_wb_ntlm_auth]) - if test "$want_wb_ntlm_auth" = "yes"; then - AC_DEFINE(WINBIND_NTLM_AUTH_ENABLED, 1, + AC_MSG_RESULT([$want_ntlm_wb]) + if test "$want_ntlm_wb" = "yes"; then + AC_DEFINE(NTLM_WB_ENABLED, 1, [Define to enable NTLM delegation to winbind's ntlm_auth helper.]) - AC_DEFINE_UNQUOTED(WINBIND_NTLM_AUTH_FILE, "$want_wb_ntlm_auth_file", + AC_DEFINE_UNQUOTED(NTLM_WB_FILE, "$want_ntlm_wb_file", [Define absolute filename for winbind's ntlm_auth helper.]) - WINBIND_NTLM_AUTH_ENABLED=1 + NTLM_WB_ENABLED=1 fi ]) |