diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-02-18 16:23:54 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-02-18 16:25:03 +0300 |
| commit | 7dfacee981a932b02d19d12b8353d9fd821291c4 (patch) | |
| tree | 4faeb5e41fd3edb0752967e1a32f7185c244c0d0 | |
| parent | b00120fa40a154cbb3ba77e7b1864a6f0a19c34b (diff) | |
....I..... [ZBX-20570] fixed --with-libevent option on FreeBSD
* commit 'b2da8f731ba20eb5f42e1fde4bc40c774f735369':
.D........ [ZBX-20570] fixed changelog entry
...G...PS. [ZBX-20570] fixed typo
...G...PS. [ZBX-20570] improved option check
...G...PS. [ZBX-20570] fixed --with-libevent option on FreeBSD
(cherry picked from commit 1faa692bf91833c125aacf778289ff0b02c5353b)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-20570 | 1 | ||||
| -rw-r--r-- | m4/libevent.m4 | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-20570 b/ChangeLog.d/bugfix/ZBX-20570 new file mode 100644 index 00000000000..3584748aad1 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-20570 @@ -0,0 +1 @@ +....I..... [ZBX-20570] fixed --with-libevent option on FreeBSD (asestakovs) diff --git a/m4/libevent.m4 b/m4/libevent.m4 index 2a025bfb540..29fd0e77ae7 100644 --- a/m4/libevent.m4 +++ b/m4/libevent.m4 @@ -33,7 +33,10 @@ AC_DEFUN([LIBEVENT_CHECK_CONFIG], If you want to specify libevent installation directories: AC_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent from given base install directory (DIR), default is to search through a number of common places for the libevent files.])], [ - test "x$withval" = "xyes" && withval=/usr + if test "x$withval" = "xyes"; then + if test -f /usr/local/include/event.h; then withval=/usr/local; else withval=/usr; fi + fi + LIBEVENT_CFLAGS="-I$withval/include" LIBEVENT_LDFLAGS="-L$withval/lib" _libevent_dir_set="yes" |