summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-07-31 20:44:41 +0200
committerYang Tse <yangsita@gmail.com>2011-07-31 20:44:41 +0200
commit10a0bed48536e5a3fe801a5e0d94bd84ad80c559 (patch)
tree931c4a697c2aaf437067ca38914c57c1aa5c32f0 /m4
parentcc3e01cfae461c69c240f21a7b10fb31e1314fb7 (diff)
downloadcurl-10a0bed48536e5a3fe801a5e0d94bd84ad80c559.tar.gz
NTLM single-sign on adjustments (VIII)
Use preprocessor symbols WINBIND_NTLM_AUTH_ENABLED and WINBIND_NTLM_AUTH_FILE for Samba's winbind daemon ntlm_auth helper code implementation and filename. Retain preprocessor symbol USE_NTLM_SSO for NTLM single-sign-on feature availability implementation independent. For test harness, prefix NTLM_AUTH environment vars with CURL_ Refactor and rename configure option --with-ntlm-auth to --enable-wb-ntlm-auth[=FILE]
Diffstat (limited to 'm4')
-rw-r--r--m4/curl-confopts.m464
1 files changed, 62 insertions, 2 deletions
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
index 30fb025fd..015101e7f 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 14
+# serial 15
dnl CURL_CHECK_OPTION_THREADED_RESOLVER
dnl -------------------------------------------------
@@ -496,3 +496,63 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
fi
])
+
+dnl CURL_CHECK_OPTION_WINBIND_NTLM_AUTH
+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 winbind's ntlm_auth helper for NTLM SSO, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)])
+AC_HELP_STRING([--disable-wb-ntlm-auth],[Disable winbind's ntlm_auth helper for NTLM SSO]),
+ OPT_WINBIND_NTLM_AUTH=$enableval)
+ want_wb_ntlm_auth_file="/usr/bin/ntlm_auth"
+ case "$OPT_WINBIND_NTLM_AUTH" in
+ no)
+ dnl --disable-wb-ntlm-auth option used
+ want_wb_ntlm_auth="no"
+ ;;
+ default)
+ dnl configure option not specified
+ want_wb_ntlm_auth="yes"
+ ;;
+ *)
+ dnl --enable-wb-ntlm-auth option used
+ want_wb_ntlm_auth="yes"
+ if test -n "$enableval" && test "$enableval" != "yes"; then
+ want_wb_ntlm_auth_file="$enableval"
+ fi
+ ;;
+ esac
+])
+
+
+dnl CURL_CHECK_WINBIND_NTLM_AUTH
+dnl -------------------------------------------------
+dnl Check if winbind's ntlm_auth helper support will
+dnl finally be enabled depending on configure option
+dnl given and target platform.
+
+AC_DEFUN([CURL_CHECK_WINBIND_NTLM_AUTH], [
+ AC_REQUIRE([CURL_CHECK_OPTION_WINBIND_NTLM_AUTH])dnl
+ AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl
+ AC_MSG_CHECKING([whether to enable winbind's ntlm_auth support for NTLM SSO])
+ if test "$ac_cv_native_windows" = "yes"; then
+ want_wb_ntlm_auth_file=""
+ want_wb_ntlm_auth="no"
+ fi
+ AC_MSG_RESULT([$want_wb_ntlm_auth])
+ if test "$want_wb_ntlm_auth" = "yes"; then
+ AC_DEFINE(WINBIND_NTLM_AUTH_ENABLED, 1,
+ [Define to enable winbind's ntlm_auth support for NTLM SSO.])
+ AC_DEFINE_UNQUOTED(WINBIND_NTLM_AUTH_FILE, "$want_wb_ntlm_auth_file",
+ [Define absolute filename for winbind's ntlm_auth helper.])
+ WINBIND_NTLM_AUTH_ENABLED=1
+ fi
+])
+