aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-08-27 06:31:18 +0200
committerYang Tse <yangsita@gmail.com>2011-08-27 06:31:18 +0200
commitb976d108f1beecff743f912f190ffc89f1ef9098 (patch)
treef3ef3290835f79bcfa51cac3c68f978739d4f2c5 /m4
parentb4f6319cf77ca2642154bdac76d6729dde56dd8e (diff)
NTLM_WB: final congruency naming adjustments
Configure script option --enable-wb-ntlm-auth renamed to --enable-ntlm-wb Configure script option --disable-wb-ntlm-auth renamed to --disable-ntlm-wb Preprocessor symbol WINBIND_NTLM_AUTH_ENABLED renamed to NTLM_WB_ENABLED Preprocessor symbol WINBIND_NTLM_AUTH_FILE renamed to NTLM_WB_FILE Test harness env var CURL_NTLM_AUTH renamed to CURL_NTLM_WB_FILE Static function wb_ntlm_close renamed to ntlm_wb_cleanup Static function wb_ntlm_initiate renamed to ntlm_wb_init Static function wb_ntlm_response renamed to ntlm_wb_response
Diffstat (limited to 'm4')
-rw-r--r--m4/curl-confopts.m468
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
])