Skip to content

Commit c6ea7f9

Browse files
committed
Refactor: make libevent depend on using openssl headers
1 parent 55ab115 commit c6ea7f9

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

configure.ac

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2787,8 +2787,7 @@ if test "$ENABLED_LIBWEBSOCKETS" = "yes" || test "$ENABLED_OPENVPN" = "yes" || \
27872787
test "$ENABLED_KRB" = "yes" || test "$ENABLED_CHRONY" = "yes" || \
27882788
test "$ENABLED_FFMPEG" = "yes" || test "$ENABLED_STRONGSWAN" = "yes" || \
27892789
test "$ENABLED_OPENLDAP" = "yes" || test "x$ENABLED_MOSQUITTO" = "xyes" || \
2790-
test "$ENABLED_HITCH" = "yes" || test "$ENABLED_NGINX" = "yes" || \
2791-
test "$ENABLED_LIBEVENT" = "yes"
2790+
test "$ENABLED_HITCH" = "yes" || test "$ENABLED_NGINX" = "yes"
27922791
then
27932792
ENABLED_OPENSSLALL="yes"
27942793
fi
@@ -10705,11 +10704,17 @@ if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_NGINX" = "yes" || \
1070510704
test "x$ENABLED_LIGHTY" = "xyes" || test "$ENABLED_LIBSSH2" = "yes" || \
1070610705
test "x$ENABLED_NTP" = "xyes" || test "$ENABLED_RSYSLOG" = "yes" || \
1070710706
test "$ENABLED_OPENLDAP" = "yes" || test "$ENABLED_HITCH" = "yes" || \
10708-
test "x$ENABLED_MOSQUITTO" = "xyes" || test "$ENABLED_LIBEVENT" = "yes"
10707+
test "x$ENABLED_MOSQUITTO" = "xyes"
1070910708
then
1071010709
ENABLED_OPENSSLEXTRA="yes"
1071110710
fi
1071210711
10712+
if test "$ENABLED_LIBEVENT" = "yes"; then
10713+
if test "$ENABLED_OPENSSLALL" != "yes" || test "$ENABLED_OPENSSLEXTRA" != "yes"; then
10714+
AC_MSG_ERROR([--enable-libevent requires --enable-opensslall and --enable-opensslextra])
10715+
fi
10716+
fi
10717+
1071310718
if test "$ENABLED_CURVE25519" != "no" && test "$ENABLED_CURVE25519" != "asm" && test "$KERNEL_MODE_DEFAULTS" = "yes"
1071410719
then
1071510720
ENABLED_CURVE25519=noasm

0 commit comments

Comments
 (0)