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

BuildSystem: Re-check for another UUID library only when previous check failed.

Browse Source 
As a side-effect, this avoids the ambiguous output:
 checking for uuid_generate_random... no
which was printed always previously.

ASTERISK-25586
Reported by: John Nemeth

Change-Id: I6d541dfcf453932a9856c5e251aa22e0e6c233c9
This commit is contained in:
Alexander Traud
2018-03-08 16:04:29 +01:00
parent 9040057db3
commit 75cebc3e71
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
configure vendored
View File

@@ -13882,6 +13882,10 @@ _ACEOF
fi
if test "x$LIBUUID_LIB" != "x" ; then
UUID_INCLUDE="$LIBUUID_INCLUDE"
UUID_LIB="$LIBUUID_LIB"
else
if test "x${PBX_E2FSUUID}" != "x1" -a "${USE_E2FSUUID}" != "no"; then
pbxlibdir=""
@@ -13978,7 +13982,11 @@ _ACEOF
fi
for ac_func in uuid_generate_random
if test "x$E2FSUUID_LIB" != "x" ; then
UUID_INCLUDE="$E2FSUUID_INCLUDE"
UUID_LIB="$E2FSUUID_LIB"
else
for ac_func in uuid_generate_random
do :
ac_fn_c_check_func "$LINENO" "uuid_generate_random" "ac_cv_func_uuid_generate_random"
if test "x$ac_cv_func_uuid_generate_random" = xyes; then :
@@ -13991,18 +13999,13 @@ else
fi
done
if test "x$LIBUUID_LIB" != "x" ; then
UUID_INCLUDE="$LIBUUID_INCLUDE"
UUID_LIB="$LIBUUID_LIB"
elif test "x$E2FSUUID_LIB" != "x" ; then
UUID_INCLUDE="$E2FSUUID_INCLUDE"
UUID_LIB="$E2FSUUID_LIB"
elif test "x$SYSUUID" != "x" ; then
UUID_INCLUDE=""
UUID_LIB=""
else
as_fn_error $? "*** uuid support not found (this typically means the uuid development package is missing)" "$LINENO" 5
if test "x$SYSUUID" != "x" ; then
UUID_INCLUDE=""
UUID_LIB=""
else
as_fn_error $? "*** uuid support not found (this typically means the uuid development package is missing)" "$LINENO" 5
fi
fi
fi