mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
BuildSystem: For consistency, avoid double-checking via if clauses.
In the script ./configure, AST_EXT_LIB_CHECK and AST_PKG_CONFIG_CHECK first test whether parameter 1 was already found. Consequently, an if-test on PBX_ just a line below is redundant, if exactly the same parameter 1 is used again. No performance gain is expected by this change. However, because this strategy is used all over in ./configure except for two places, this change aims to create more consistency: Only do something different if there is a reason to do so. Change-Id: I4a6f48127b7af3a48168c917e888be1f70625027
This commit is contained in:
Alexander Traud
56
configure
vendored
56
configure
vendored
@@ -19447,9 +19447,7 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "${PBX_BFD}" = "0"; then
|
||||
# Fedora/RedHat/CentOS require extra libraries
|
||||
# Fedora/RedHat/CentOS require extra libraries
|
||||
|
||||
if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
|
||||
pbxlibdir=""
|
||||
@@ -19464,9 +19462,9 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
|
||||
|
||||
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
||||
CFLAGS="${CFLAGS} "
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5
|
||||
$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; }
|
||||
if ${ac_cv_lib_bfd_bfd_check_format+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
|
||||
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
|
||||
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@@ -19480,27 +19478,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char bfd_check_format ();
|
||||
char bfd_openr ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return bfd_check_format ();
|
||||
return bfd_openr ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_bfd_bfd_check_format=yes
|
||||
ac_cv_lib_bfd_bfd_openr=yes
|
||||
else
|
||||
ac_cv_lib_bfd_bfd_check_format=no
|
||||
ac_cv_lib_bfd_bfd_openr=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5
|
||||
$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; }
|
||||
if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
|
||||
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
|
||||
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
|
||||
AST_BFD_FOUND=yes
|
||||
else
|
||||
AST_BFD_FOUND=no
|
||||
@@ -19546,10 +19544,7 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "${PBX_BFD}" = "0"; then
|
||||
# openSUSE requires -lz
|
||||
# openSUSE requires -lz
|
||||
|
||||
if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
|
||||
pbxlibdir=""
|
||||
@@ -19564,9 +19559,9 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
|
||||
|
||||
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
||||
CFLAGS="${CFLAGS} "
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5
|
||||
$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; }
|
||||
if ${ac_cv_lib_bfd_bfd_check_format+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
|
||||
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
|
||||
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@@ -19580,27 +19575,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char bfd_check_format ();
|
||||
char bfd_openr ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return bfd_check_format ();
|
||||
return bfd_openr ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_bfd_bfd_check_format=yes
|
||||
ac_cv_lib_bfd_bfd_openr=yes
|
||||
else
|
||||
ac_cv_lib_bfd_bfd_check_format=no
|
||||
ac_cv_lib_bfd_bfd_openr=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5
|
||||
$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; }
|
||||
if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
|
||||
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
|
||||
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
|
||||
AST_BFD_FOUND=yes
|
||||
else
|
||||
AST_BFD_FOUND=no
|
||||
@@ -19646,7 +19641,6 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "x${OSARCH}" = "xlinux-gnu" ; then
|
||||
|
||||
@@ -20461,8 +20455,7 @@ $as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
|
||||
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
|
||||
pbxlibdir=""
|
||||
@@ -20559,9 +20552,8 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test "$PBX_LIBEDIT" = "1"; then
|
||||
LIBEDIT_INTERNAL="no"
|
||||
LIBEDIT_INTERNAL="no"
|
||||
fi
|
||||
fi
|
||||
if test "${LIBEDIT_INTERNAL}" = "yes"; then
|
||||
|
||||
22
configure.ac
22
configure.ac
@@ -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([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])
|
||||
|
||||
if test "x${OSARCH}" = "xlinux-gnu" ; then
|
||||
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
|
||||
@@ -1539,12 +1533,10 @@ if test "${USE_LIBEDIT}" != "no"; then
|
||||
fi
|
||||
if test "${LIBEDIT_SYSTEM}" = "yes"; then
|
||||
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
|
||||
LIBEDIT_INTERNAL="no"
|
||||
LIBEDIT_INTERNAL="no"
|
||||
fi
|
||||
fi
|
||||
if test "${LIBEDIT_INTERNAL}" = "yes"; then
|
||||
|
||||
Reference in New Issue
Block a user