* Reverse a change where tcl what taken out of the build, preventing

     webalpine to be built.

2 files changed, 54 insertions, 69 deletions

diff --git a/configure b/configure
index 5b8d63ef..c32f559f 100755
--- a/configure
+++ b/configure
@@ -20121,50 +20121,10 @@ $as_echo "$as_me: NOT including NTLM Support: $alpine_ntlm_none_reason" >&6;}
 fi
 
 if test -n "$WEB_BUILD" ; then
-    if test -n "$alpine_TCLINC" ; then
-    as_ac_Header=`$as_echo "ac_cv_header_$alpine_TCLINC/tcl.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$alpine_TCLINC/tcl.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-
-else
-
-	WEB_BUILD=
-
-fi
-
-
-    if test -z "$WEB_BUILD" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Tcl Include file NOT found" >&5
-$as_echo "$as_me: Tcl Include file NOT found" >&6;}
-    fi
-  else
-    ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcl_h" = xyes; then :
-
-else
-
-	for base in /usr /usr/local ; do
-	 for dir in ${TCL_VERSIONS} ; do
-	  if test -f $base/include/$dir/tcl.h ; then
-	    CPPFLAGS="$CPPFLAGS -I$base/include/$dir"
-	    found=yes
-	    break
-	  fi
-	 done
-	 if test "x$found" = "xyes" ; then
-	    break
-	 fi
-	done
-	if test "$found" != "yes" ; then
-	    WEB_BUILD=
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: header file tcl.h NOT found: Web Alpine will not be built" >&5
-$as_echo "$as_me: header file tcl.h NOT found: Web Alpine will not be built" >&6;}
-	else
-	    TCL_VERSIONS_DOT="tcl8.6 tcl8.5 tcl8.4 tcl8.3"
-	    TCL_VERSIONS_NODOT="`echo ${TCL_VERSIONS_DOT} | ${SED} 's/\.//g'`"
-	    TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
-
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_Eval" >&5
+TCL_VERSIONS_DOT="tcl8.6 tcl8.5 tcl8.4 tcl8.3"
+TCL_VERSIONS_NODOT="`echo ${TCL_VERSIONS_DOT} | ${SED} 's/\.//g'`"
+TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_Eval" >&5
 $as_echo_n "checking for library containing Tcl_Eval... " >&6; }
 if ${ac_cv_search_Tcl_Eval+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -20220,14 +20180,49 @@ if test "$ac_res" != no; then :
 
 else
 
-	      WEB_BUILD=
+      WEB_BUILD=
 
 fi
 
-	    if test -z "$WEB_BUILD" ; then
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: TCL Lib files not found: Web Alpine will not be built" >&5
-$as_echo "$as_me: TCL Lib files not found: Web Alpine will not be built" >&6;}
-	    fi
+
+    if test -n "$alpine_TCLINC" ; then
+    as_ac_Header=`$as_echo "ac_cv_header_$alpine_TCLINC/tcl.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$alpine_TCLINC/tcl.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+else
+
+	WEB_BUILD=
+
+fi
+
+
+    if test -z "$WEB_BUILD" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Tcl Include file NOT found" >&5
+$as_echo "$as_me: Tcl Include file NOT found" >&6;}
+    fi
+  else
+    ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
+if test "x$ac_cv_header_tcl_h" = xyes; then :
+
+else
+
+	for base in /usr /usr/local ; do
+	 for dir in ${TCL_VERSIONS} ; do
+	  if test -f $base/include/$dir/tcl.h ; then
+	    CPPFLAGS="$CPPFLAGS -I$base/include/$dir"
+	    found=yes
+	    break
+	  fi
+	 done
+	 if test "x$found" = "xyes" ; then
+	    break
+	 fi
+	done
+	if test "$found" != "yes" ; then
+	    WEB_BUILD=
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: header file tcl.h NOT found: Web Alpine will not be built" >&5
+$as_echo "$as_me: header file tcl.h NOT found: Web Alpine will not be built" >&6;}
 	fi
 
 fi
@@ -22558,10 +22553,7 @@ if test -n "$alpine_c_client_gccoptlevel" ; then
 
 fi
 
-if test -n $extra_auth_ntlm ; then
-  ALPINE_space=" "
-fi
-c_client_auths="${extra_auth_gss}${ALPINE_space}${extra_auth_ntlm}"
+c_client_auths="$extra_auth_gss $extra_auth_ntlm"
 C_CLIENT_AUTHS=$c_client_auths
 
 
diff --git a/configure.ac b/configure.ac
index ab9f89a8..92a584d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1645,6 +1645,14 @@ fi
 
 dnl check for tcl libraries for Web Alpine (HACKY)
 if test -n "$WEB_BUILD" ; then
+TCL_VERSIONS_DOT="tcl8.6 tcl8.5 tcl8.4 tcl8.3"
+TCL_VERSIONS_NODOT="`echo ${TCL_VERSIONS_DOT} | ${SED} 's/\.//g'`"
+TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
+  AC_SEARCH_LIBS([Tcl_Eval],[$alpine_TCLLIB ${TCL_VERSIONS}],,
+    [
+      WEB_BUILD=
+    ])
+
   dnl look for header file
   if test -n "$alpine_TCLINC" ; then
     AC_CHECK_HEADER($alpine_TCLINC/tcl.h,,
@@ -1672,18 +1680,6 @@ if test -n "$WEB_BUILD" ; then
 	if test "$found" != "yes" ; then
 	    WEB_BUILD=
 	    AC_MSG_NOTICE([header file tcl.h NOT found: Web Alpine will not be built])
-	else
-	    TCL_VERSIONS_DOT="tcl8.6 tcl8.5 tcl8.4 tcl8.3"
-	    TCL_VERSIONS_NODOT="`echo ${TCL_VERSIONS_DOT} | ${SED} 's/\.//g'`"
-	    TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
-
-	    AC_SEARCH_LIBS([Tcl_Eval],[$alpine_TCLLIB ${TCL_VERSIONS}],,
-	    [
-	      WEB_BUILD=
-	    ])
-	    if test -z "$WEB_BUILD" ; then
-	       AC_MSG_NOTICE([TCL Lib files not found: Web Alpine will not be built])
-	    fi
 	fi
       ])
   fi
@@ -2083,10 +2079,7 @@ if test -n "$alpine_c_client_gccoptlevel" ; then
   AC_SUBST(C_CLIENT_GCCOPTLEVEL, GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\")
 fi
 
-if test -n $extra_auth_ntlm ; then
-  ALPINE_space=" "
-fi
-c_client_auths="${extra_auth_gss}${ALPINE_space}${extra_auth_ntlm}"
+c_client_auths="$extra_auth_gss $extra_auth_ntlm"
 AC_SUBST([C_CLIENT_AUTHS], $c_client_auths)
 
 AC_SUBST([C_CLIENT_SPECIALS], $c_client_specials)