From fd310f16dad9cc1e05752e45d905ec1b3aa3c3d0 Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Wed, 29 Aug 2018 20:54:10 -0600
Subject:    * Reverse a change where tcl what taken out of the build,
 preventing      webalpine to be built.

---
 configure.ac | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'configure.ac')

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)
-- 
cgit v1.2.3-54-g00ecf