diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-13 10:48:41 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-13 10:48:41 -0500 |
| commit | a979e52c0a351b6784530be04c0b096a7428a720 (patch) | |
| tree | 3222afbb5b071d2779b1e7edbb6d1d9878c788af /configure.ac | |
| parent | 7744e8380527ea045b95e156da79a49efbd65523 (diff) | |
| parent | c5f2332953b0871824ed93e99fb10ae625eaeadf (diff) | |
Merge "BuildSystem: For consistency, avoid double-checking via if clauses."
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a5e81d208..893489ac3 100644 --- a/configure.ac +++ b/configure.ac @@ -1458,16 +1458,10 @@ PKG_PROG_PKG_CONFIG() AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl]) AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h]) - -if test "${PBX_BFD}" = "0"; then - # Fedora/RedHat/CentOS require extra libraries - AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty]) -fi - -if test "${PBX_BFD}" = "0"; then - # openSUSE requires -lz - AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz]) -fi +# Fedora/RedHat/CentOS require extra libraries +AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty]) +# openSUSE requires -lz +AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty -lz]) case "${OSARCH}" in linux*) @@ -1575,10 +1569,8 @@ if test "${USE_ILBC}" != "no"; then fi AST_PKG_CONFIG_CHECK(LIBEDIT, libedit) -if test "${PBX_LIBEDIT}" != 1; then - # some platforms do not list libedit via pkg-config, for example OpenBSD 6.2 - AST_EXT_LIB_CHECK([LIBEDIT], [edit], [history_init], [histedit.h], [-ltermcap]) -fi +# some platforms do not list libedit via pkg-config, for example OpenBSD 6.2 +AST_EXT_LIB_CHECK([LIBEDIT], [edit], [history_init], [histedit.h], [-ltermcap]) if test "${PBX_LIBEDIT}" != 1; then AC_MSG_ERROR(*** Please install the 'libedit' development package.) exit 1 |