osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2004-09-25 23:58:42 +00:00
parent 3bee1b0611
commit b1bde8fe6a
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
acinclude.m4
View File

@ -1010,14 +1010,29 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
CFLAGS="$CFLAGS $KRB5_FLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
#
# 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"
then
KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'`
KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
fi
# 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
*-lcrypto*)
if test ! -z "$SSL_LIBS"
then
KRB5_LIBS=`echo $KRB5_FLAGS | sed 's/-lcrypto//'`
KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
else
AC_MSG_ERROR([Kerberos library requires -lcrypto but --with-ssl not specified])
fi
;;
esac
#
# Looks like krb5-config is lacking -lresolv on some systems.
# At least on some of those systems (such as FreeBSD 4.6),