diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2018-07-06 20:39:02 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2018-07-06 20:39:02 -0600 |
| commit | 28d0918a3d1647a8671dbc50d6abd263980f2272 (patch) | |
| tree | 13c89be8b66230a6f4d0835358cecc9cb21af24f /configure.ac | |
| parent | 46320c849ee311cf4b39900993be8961e590a5c4 (diff) | |
| download | alpine-28d0918a3d1647a8671dbc50d6abd263980f2272.tar.xz | |
* Update configure script to remove the search for a linking tcl
library until the development header have been found, and update
C_CLIENT_AUTHS to not to have a trailing space.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 92a584d..ab9f89a 100644 --- a/configure.ac +++ b/configure.ac @@ -1645,14 +1645,6 @@ 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,, @@ -1680,6 +1672,18 @@ TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl" 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 @@ -2079,7 +2083,10 @@ if test -n "$alpine_c_client_gccoptlevel" ; then AC_SUBST(C_CLIENT_GCCOPTLEVEL, GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\") fi -c_client_auths="$extra_auth_gss $extra_auth_ntlm" +if test -n $extra_auth_ntlm ; then + ALPINE_space=" " +fi +c_client_auths="${extra_auth_gss}${ALPINE_space}${extra_auth_ntlm}" AC_SUBST([C_CLIENT_AUTHS], $c_client_auths) AC_SUBST([C_CLIENT_SPECIALS], $c_client_specials) |