BuildSystem: For consistency, avoid extra libs to be empty.
AST_EXT_LIB_CHECK has several optional parameters. When an optional parameter is left empty, [] is used to indicate this. However, this is done in the script ./configure only then, when a further parameter is not empty. For example, when no extra libraries are needed to test the checked library, parameter 5 is not mentioned. Except parameter 6 and higher are used, then parameter 5 must be empty. However, this general rule was broken * four times for parameter 5 (extra libs) and * three times for parameter 4 (header) as found via the Regular Expression \[\]\). In case of parameter 5, all cases were changed, because that happened for no reason. In case of parameter 4, an [] improves readability actually. Therefore for parameter 4, the only case which did not do it was changed. All this aims to create more consistency: Only do something different if there is a reason to do so. Change-Id: I037ef170cf1ad94497151a9ea5071a31c656cafe
This commit is contained in:
parent
f03b984724
commit
bfefde5b07
10
configure.ac
10
configure.ac
|
@ -645,12 +645,12 @@ AC_SUBST(EDITLINE_LIB)
|
|||
# * -luuid on Linux
|
||||
# * -le2fs-uuid on OpenBSD
|
||||
# * in libsystem on OS X
|
||||
AST_EXT_LIB_CHECK([LIBUUID], [uuid], [uuid_generate_random], [uuid/uuid.h], [])
|
||||
AST_EXT_LIB_CHECK([LIBUUID], [uuid], [uuid_generate_random], [uuid/uuid.h])
|
||||
if test "x$LIBUUID_LIB" != "x" ; then
|
||||
UUID_INCLUDE="$LIBUUID_INCLUDE"
|
||||
UUID_LIB="$LIBUUID_LIB"
|
||||
else
|
||||
AST_EXT_LIB_CHECK([E2FSUUID], [e2fs-uuid], [uuid_generate_random], [uuid/uuid.h], [])
|
||||
AST_EXT_LIB_CHECK([E2FSUUID], [e2fs-uuid], [uuid_generate_random], [uuid/uuid.h])
|
||||
if test "x$E2FSUUID_LIB" != "x" ; then
|
||||
UUID_INCLUDE="$E2FSUUID_INCLUDE"
|
||||
UUID_LIB="$E2FSUUID_LIB"
|
||||
|
@ -675,7 +675,7 @@ if test "${PBX_JANSSON}" != 1; then
|
|||
fi
|
||||
|
||||
# See if clock_gettime is in librt
|
||||
AST_EXT_LIB_CHECK([RT], [rt], [clock_gettime])
|
||||
AST_EXT_LIB_CHECK([RT], [rt], [clock_gettime], [])
|
||||
|
||||
AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
|
||||
[#include <libxml/tree.h>
|
||||
|
@ -2193,10 +2193,10 @@ AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
|
|||
# script bug which does not find the ldns library. The bug is fixed in
|
||||
# v1.4.22 but that version is not easily detectable.
|
||||
#
|
||||
AST_EXT_LIB_CHECK([UNBOUND], [unbound], [ub_ctx_delete], [unbound.h], [])
|
||||
AST_EXT_LIB_CHECK([UNBOUND], [unbound], [ub_ctx_delete], [unbound.h])
|
||||
AST_C_DECLARE_CHECK([UNBOUND_CONST_PARAMS], [UNBOUND_VERSION_MAJOR], [unbound.h])
|
||||
|
||||
AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [])
|
||||
AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h])
|
||||
|
||||
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_stream_init], [ogg/ogg.h])
|
||||
|
||||
|
|
Loading…
Reference in New Issue