diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-11-01 09:23:22 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-11-05 10:39:38 +0000 |
| commit | 62f705e8445336e73a81e1df10987e24529bf418 (patch) | |
| tree | 7f1207602130d4e20bad5c676d137cf8ceac2091 /acinclude.m4 | |
| parent | 711f69c807a5566060bea94ac7042b43bf3cbeab (diff) | |
autotools: Try to be clearer about --with-ssl and remove cruft
Change-Id: Iaf8c8a83ead1d6671bb9cadb6add56481ed98aaa
Reviewed-on: https://code.wireshark.org/review/24242
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2b95518b4f..70cec35044 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -919,7 +919,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK], ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir" if test "x$ac_krb5_version" = "xHEIMDAL" then - KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt" + KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 -lcrypto -lroken -lcrypt" else KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lk5crypto -lcom_err" fi @@ -933,33 +933,23 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK], then KRB5_CFLAGS=`"$KRB5_CONFIG" --cflags` KRB5_LIBS=`"$KRB5_CONFIG" --libs` - # - # If -lcrypto is in KRB5_FLAGS, we require it to build - # with Heimdal/MIT. We don't want to built with it by - # default, due to annoying license incompatibilities - # between the OpenSSL license and the GPL, so: - # - # 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_LIBS | sed 's/-lcrypto//'` - KRB5_LIBS="$KRB5_LIBS $SSL_LIBS" - else - AC_MSG_ERROR([Kerberos library requires -lcrypto, so you must specify --with-ssl]) - fi - ;; - esac ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/' -e 's/^Solaris Kerberos .*$/MIT/'` fi fi + # + # If -lcrypto is in KRB5_LIBS, we require it to build + # with Heimdal/MIT. We don't want to built with it by + # default, due to annoying license incompatibilities + # between the OpenSSL license and the GPL. + # + case "$KRB5_LIBS" in + *-lcrypto*) + if test "x$with_krb5_crypto_openssl" != "xyes" + then + AC_MSG_ERROR([Kerberos library requires -lcrypto, so you must specify --with-krb5-crypto-openssl]) + fi + ;; + esac CPPFLAGS="$CPPFLAGS $KRB5_CFLAGS" |