]> granicus.if.org Git - libevent/commitdiff
Fix build w/o OpenSSL by w/ MbedTLS
authorJay Freeman (saurik) <saurik@saurik.com>
Sat, 12 Feb 2022 19:53:11 +0000 (22:53 +0300)
committerAzat Khuzhin <azat@libevent.org>
Sat, 12 Feb 2022 19:57:30 +0000 (22:57 +0300)
In 78fa3971be892194aa168c04fc34bf5f2cd99b99 from
https://github.com/libevent/libevent/pull/1241#commitcomment-63865496 a
new "if MBEDTLS" block was added to include/include.am. This is not
parsed by automake as it isn't on the first column, resulting in a
subsequent error in the build.

From [1]:

> The if, else, and endif statements should not be indented, i.e., start on column one.

  [1]: https://www.gnu.org/software/automake/manual/html_node/Usage-of-Conditionals.html

Fixes: #1251
Fixes: google/oss-fuzz#7149
include/include.am

index 93f32f1ab8f4e599964d738669bf0c3315721ec8..8a5bd026a33326ae8b4a883e7908492d51f45ac3 100644 (file)
@@ -36,9 +36,9 @@ EVENT2_EXPORT = \
 if OPENSSL
 EVENT2_EXPORT += include/event2/bufferevent_ssl.h
 else
-    if MBEDTLS
-    EVENT2_EXPORT += include/event2/bufferevent_ssl.h
-    endif
+if MBEDTLS
+EVENT2_EXPORT += include/event2/bufferevent_ssl.h
+endif
 endif
 
 ## Without the nobase_ prefixing, Automake would strip "include/event2/" from