diff options
author | Eduardo Chappa <chappa@washington.edu> | 2022-06-04 01:28:26 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2022-06-04 01:28:26 -0600 |
commit | f95e2d179774739a885468144e68de047245ada5 (patch) | |
tree | 99e044d3ee7c6c308f80ca8e887ebbbea1e1d471 | |
parent | 9726c098a739edfdca6218bc5dee104c310957e9 (diff) | |
download | alpine-f95e2d179774739a885468144e68de047245ada5.tar.xz |
* If kerberos is not fully installed remove it from the list of libraries.
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -20266,6 +20266,7 @@ C_CLIENT_BUNDLED=$alpine_c_client_bundled if test "x$alpine_GSSTYPE" != "xnone" ; then + OLDLIB="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 $as_echo_n "checking for library containing gss_init_sec_context... " >&6; } if ${ac_cv_search_gss_init_sec_context+:} false; then : @@ -20329,6 +20330,7 @@ else if test ! -d /usr/kerberos/include ; then alpine_GSSTYPE="none" alpine_gss_none_reason="header files not found" + LIBS="$OLDLIBS" fi fi diff --git a/configure.ac b/configure.ac index 4fa94f16..de5ecb57 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,6 +1684,7 @@ AC_SUBST([C_CLIENT_BUNDLED], $alpine_c_client_bundled) dnl provide KRB5 support? if test "x$alpine_GSSTYPE" != "xnone" ; then + OLDLIB="$LIBS" AC_SEARCH_LIBS(gss_init_sec_context,gss gssapi gssapi_krb5, [ dnl MIT-based? @@ -1693,6 +1694,7 @@ if test "x$alpine_GSSTYPE" != "xnone" ; then if test ! -d /usr/kerberos/include ; then alpine_GSSTYPE="none" alpine_gss_none_reason="header files not found" + LIBS="$OLDLIBS" fi ]) ], diff --git a/pith/pine.hlp b/pith/pine.hlp index 9609b6db..fb05a0d2 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -147,7 +147,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 649 2022-06-02 18:13:05 +Alpine Commit 650 2022-06-04 01:28:23 ============= h_news ================= <HTML> <HEAD> |