kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "BuildSystem: For consistency, avoid double-checking via if clauses." into 13

Browse Source
This commit is contained in:
Joshua Colp
2018-03-13 10:43:16 -05:00
committed by Gerrit Code Review
parent aae7fd6508 ba88af8a25
commit e3c76be75b
2 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
configure vendored
View File

@@ -19447,9 +19447,7 @@ _ACEOF
fi fi
# Fedora/RedHat/CentOS require extra libraries
if test "${PBX_BFD}" = "0"; then
# Fedora/RedHat/CentOS require extra libraries
if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -19464,9 +19462,9 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} " CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; } $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_check_format+:} false; then : if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -19480,27 +19478,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char bfd_check_format (); char bfd_openr ();
int int
main () main ()
{ {
return bfd_check_format (); return bfd_openr ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bfd_bfd_check_format=yes ac_cv_lib_bfd_bfd_openr=yes
else else
ac_cv_lib_bfd_bfd_check_format=no ac_cv_lib_bfd_bfd_openr=no
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; } $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then : if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
AST_BFD_FOUND=yes AST_BFD_FOUND=yes
else else
AST_BFD_FOUND=no AST_BFD_FOUND=no
@@ -19546,10 +19544,7 @@ _ACEOF
fi fi
fi # openSUSE requires -lz
if test "${PBX_BFD}" = "0"; then
# openSUSE requires -lz
if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -19564,9 +19559,9 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} " CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; } $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_check_format+:} false; then : if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -19580,27 +19575,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char bfd_check_format (); char bfd_openr ();
int int
main () main ()
{ {
return bfd_check_format (); return bfd_openr ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bfd_bfd_check_format=yes ac_cv_lib_bfd_bfd_openr=yes
else else
ac_cv_lib_bfd_bfd_check_format=no ac_cv_lib_bfd_bfd_openr=no
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; } $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then : if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
AST_BFD_FOUND=yes AST_BFD_FOUND=yes
else else
AST_BFD_FOUND=no AST_BFD_FOUND=no
@@ -19646,7 +19641,6 @@ _ACEOF
fi fi
fi
if test "x${OSARCH}" = "xlinux-gnu" ; then if test "x${OSARCH}" = "xlinux-gnu" ; then
@@ -20461,8 +20455,7 @@ $as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
fi fi
fi fi
if test "$PBX_LIBEDIT" != "1"; then # some platforms do not list libedit via pkg-config, for example OpenBSD 6.2
# some platforms do not list libedit via pkg-config, for example OpenBSD 6.2
if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -20559,9 +20552,8 @@ _ACEOF
fi fi
fi
if test "$PBX_LIBEDIT" = "1"; then if test "$PBX_LIBEDIT" = "1"; then
LIBEDIT_INTERNAL="no" LIBEDIT_INTERNAL="no"
fi fi
fi fi
if test "${LIBEDIT_INTERNAL}" = "yes"; then if test "${LIBEDIT_INTERNAL}" = "yes"; then

22
configure.ac
View File

@@ -1414,16 +1414,10 @@ PKG_PROG_PKG_CONFIG()
AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl]) AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h]) AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h])
# Fedora/RedHat/CentOS require extra libraries
if test "${PBX_BFD}" = "0"; then AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty])
# Fedora/RedHat/CentOS require extra libraries # openSUSE requires -lz
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty]) AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty -lz])
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
if test "x${OSARCH}" = "xlinux-gnu" ; then if test "x${OSARCH}" = "xlinux-gnu" ; then
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h]) AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
@@ -1539,12 +1533,10 @@ if test "${USE_LIBEDIT}" != "no"; then
fi fi
if test "${LIBEDIT_SYSTEM}" = "yes"; then if test "${LIBEDIT_SYSTEM}" = "yes"; then
AST_PKG_CONFIG_CHECK(LIBEDIT, libedit) 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
# 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])
AST_EXT_LIB_CHECK([LIBEDIT], [edit], [history_init], [histedit.h], [-ltermcap])
fi
if test "$PBX_LIBEDIT" = "1"; then if test "$PBX_LIBEDIT" = "1"; then
LIBEDIT_INTERNAL="no" LIBEDIT_INTERNAL="no"
fi fi
fi fi
if test "${LIBEDIT_INTERNAL}" = "yes"; then if test "${LIBEDIT_INTERNAL}" = "yes"; then