<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8476">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Re-check for another UUID library only when previous check failed.<br><br>As a side-effect, this avoids the ambiguous output:<br> checking for uuid_generate_random... no<br>which was printed always previously.<br><br>ASTERISK-25586<br>Reported by: John Nemeth<br><br>Change-Id: I6d541dfcf453932a9856c5e251aa22e0e6c233c9<br>---<br>M configure<br>M configure.ac<br>2 files changed, 29 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 2456b0c..4ca42d4 100755<br>--- a/configure<br>+++ b/configure<br>@@ -13846,6 +13846,10 @@<br> fi<br> <br> <br>+if test "x$LIBUUID_LIB" != "x" ; then<br>+  UUID_INCLUDE="$LIBUUID_INCLUDE"<br>+  UUID_LIB="$LIBUUID_LIB"<br>+else<br> <br> if test "x${PBX_E2FSUUID}" != "x1" -a "${USE_E2FSUUID}" != "no"; then<br>    pbxlibdir=""<br>@@ -13942,7 +13946,11 @@<br> fi<br> <br> <br>-for ac_func in uuid_generate_random<br>+  if test "x$E2FSUUID_LIB" != "x" ; then<br>+    UUID_INCLUDE="$E2FSUUID_INCLUDE"<br>+    UUID_LIB="$E2FSUUID_LIB"<br>+  else<br>+    for ac_func in uuid_generate_random<br> do :<br>   ac_fn_c_check_func "$LINENO" "uuid_generate_random" "ac_cv_func_uuid_generate_random"<br> if test "x$ac_cv_func_uuid_generate_random" = xyes; then :<br>@@ -13955,18 +13963,13 @@<br> fi<br> done<br> <br>-<br>-if test "x$LIBUUID_LIB" != "x" ; then<br>-  UUID_INCLUDE="$LIBUUID_INCLUDE"<br>-  UUID_LIB="$LIBUUID_LIB"<br>-elif test "x$E2FSUUID_LIB" != "x" ; then<br>-  UUID_INCLUDE="$E2FSUUID_INCLUDE"<br>-  UUID_LIB="$E2FSUUID_LIB"<br>-elif test "x$SYSUUID" != "x" ; then<br>-  UUID_INCLUDE=""<br>-  UUID_LIB=""<br>-else<br>-  as_fn_error $? "*** uuid support not found (this typically means the uuid development package is missing)" "$LINENO" 5<br>+    if test "x$SYSUUID" != "x" ; then<br>+      UUID_INCLUDE=""<br>+      UUID_LIB=""<br>+    else<br>+      as_fn_error $? "*** uuid support not found (this typically means the uuid development package is missing)" "$LINENO" 5<br>+    fi<br>+  fi<br> fi<br> <br> <br>diff --git a/configure.ac b/configure.ac<br>index 571987c..7e80b1a 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -637,20 +637,23 @@<br> #  * -le2fs-uuid on OpenBSD<br> #  * in libsystem on OS X<br> AST_EXT_LIB_CHECK([LIBUUID], [uuid], [uuid_generate_random], [uuid/uuid.h], [])<br>-AST_EXT_LIB_CHECK([E2FSUUID], [e2fs-uuid], [uuid_generate_random], [uuid/uuid.h], [])<br>-AC_CHECK_FUNCS([uuid_generate_random], [SYSUUID=true], [SYSUUID=""])<br>-<br> if test "x$LIBUUID_LIB" != "x" ; then<br>   UUID_INCLUDE="$LIBUUID_INCLUDE"<br>   UUID_LIB="$LIBUUID_LIB"<br>-elif test "x$E2FSUUID_LIB" != "x" ; then<br>-  UUID_INCLUDE="$E2FSUUID_INCLUDE"<br>-  UUID_LIB="$E2FSUUID_LIB"<br>-elif test "x$SYSUUID" != "x" ; then<br>-  UUID_INCLUDE=""<br>-  UUID_LIB=""<br> else<br>-  AC_MSG_ERROR([*** uuid support not found (this typically means the uuid development package is missing)])<br>+  AST_EXT_LIB_CHECK([E2FSUUID], [e2fs-uuid], [uuid_generate_random], [uuid/uuid.h], [])<br>+  if test "x$E2FSUUID_LIB" != "x" ; then<br>+    UUID_INCLUDE="$E2FSUUID_INCLUDE"<br>+    UUID_LIB="$E2FSUUID_LIB"<br>+  else<br>+    AC_CHECK_FUNCS([uuid_generate_random], [SYSUUID=true], [SYSUUID=""])<br>+    if test "x$SYSUUID" != "x" ; then<br>+      UUID_INCLUDE=""<br>+      UUID_LIB=""<br>+    else<br>+      AC_MSG_ERROR([*** uuid support not found (this typically means the uuid development package is missing)])<br>+    fi<br>+  fi<br> fi<br> AC_SUBST(UUID_INCLUDE)<br> AC_SUBST(UUID_LIB)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8476">change 8476</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8476"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6d541dfcf453932a9856c5e251aa22e0e6c233c9 </div>
<div style="display:none"> Gerrit-Change-Number: 8476 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>