|author||Guy Harris <email@example.com>||2004-09-25 23:58:42 +0000|
|committer||Guy Harris <firstname.lastname@example.org>||2004-09-25 23:58:42 +0000|
For annoying licensing reasons, we don't want to use -lcrypto unless the
user explicitly says to do so by using --with-ssl. However, we *still* don't want to just blithely replace -lcrypto with SSL_LIBS, so, if KRB5_LIBS contains "-lcrypto" but SSL_LIBS isn't set to a non-empty string, we report an error (the user can than either configure without Kerberos or with -lcrypto). svn path=/trunk/; revision=12103
Diffstat (limited to 'acinclude.m4')
1 files changed, 22 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 972cdc4fe8..70fe707ae8 100644
@@ -1010,14 +1010,29 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
- # If we've set SSL_LIBS, use that instead of -lcrypto
- # in KRB5_LIBS.
+ # If -lcrypto is in KRB5_FLAGS, we require it to build
+ # with Heimdal. We don't want to built with it by
+ # default, due to annoying license incompatibilities
+ # between the OpenSSL license and the GPL, so:
- if test ! -z "$SSL_LIBS"
- KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'`
- KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
+ # if SSL_LIBS is set to a non-empty string, we
+ # remove -lcrypto from KRB5_LIBS and replace
+ # it with SSL_LIBS;
+ # if SSL_LIBS is not set to a non-empty string
+ # we fail with an appropriate error message.
+ case "$KRB5_LIBS" in
+ if test ! -z "$SSL_LIBS"
+ KRB5_LIBS=`echo $KRB5_FLAGS | sed 's/-lcrypto//'`
+ KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
+ AC_MSG_ERROR([Kerberos library requires -lcrypto but --with-ssl not specified])
# Looks like krb5-config is lacking -lresolv on some systems.
# At least on some of those systems (such as FreeBSD 4.6),