diff options
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 00df85a745..3a8585ae31 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -960,7 +960,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK], KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` CFLAGS="$CFLAGS $KRB5_FLAGS" CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" - KRB5_LIBS=`"$KRB5_CONFIG" --libs` + KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'` $SSL_LIBS # Looks like krb5-config is lacking -lresolv on some systems AC_MSG_CHECKING(whether library list looks OK) if echo "$KRB5_LIBS" | grep resolv >/dev/null diff --git a/configure.in b/configure.in index 408fb1be13..5e869c5e55 100644 --- a/configure.in +++ b/configure.in @@ -739,6 +739,7 @@ if test "x$enable_ssl" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) + AC_MSG_CHECKING(whether SSL library is available) AC_ETHEREAL_SSL_CHECK fi AC_SUBST(SSL_LIBS) @@ -816,7 +817,7 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h) if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then SNMP_LIBS=`$NETSNMPCONFIG --libs` - if echo "$SNMP_LIBS" | grep crypto && test "x$SSL_LIBS" = "x"; then + if echo "$SNMP_LIBS" | grep crypto >/dev/null && test "x$SSL_LIBS" = "x"; then AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP) CFLAGS="$ethereal_save_CFLAGS" CPPFLAGS="$ethereal_save_CPPFLAGS" |