diff options
author | Alexander Traud <pabstraud@compuserve.com> | 2018-03-08 16:04:29 +0100 |
---|---|---|
committer | Alexander Traud <pabstraud@compuserve.com> | 2018-03-08 16:04:29 +0100 |
commit | 75cebc3e71560e080c7157882583652684a3d720 (patch) | |
tree | eca67f07112684f45a4c0edadc9d0b5e975d1539 /configure | |
parent | 9040057db38dbc3d8181a5405d13ed8c8083d438 (diff) |
BuildSystem: Re-check for another UUID library only when previous check failed.
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
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 29 |
1 files changed, 16 insertions, 13 deletions
@@ -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 |