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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Enable autotools in Solaris 11.<br><br>Because this was the last operating system which required a special case, a<br>version appended to the autotools, the whole version stuff is removed by this<br>change. This simplifies the script ./bootstrap.sh. Hopefully, this gives even<br>broader platform compatibility.<br><br>ASTERISK-27929<br>ASTERISK-27926<br><br>Change-Id: Id4cf433a1a7fa861d0210e1a2e16ca592b49fd5a<br>---<br>M bootstrap.sh<br>1 file changed, 12 insertions(+), 47 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bootstrap.sh b/bootstrap.sh<br>index baf9474..3843c9a 100755<br>--- a/bootstrap.sh<br>+++ b/bootstrap.sh<br>@@ -9,61 +9,26 @@<br>        fi<br> }<br> <br>-# On FreeBSD and OpenBSD, multiple autoconf/automake versions have different names.<br>-# On Linux, environment variables tell which one to use.<br>+# OpenBSD: pkg_add autoconf%2.63 automake%1.9 metaauto<br>+test -n "$AUTOCONF_VERSION" || export AUTOCONF_VERSION=2.63<br>+test -n "$AUTOMAKE_VERSION" || export AUTOMAKE_VERSION=1.9<br> <br>-case `uname -sr` in<br>-  DragonFly*)<br>-          MY_AC_VER=<br>-           MY_AM_VER=<br>-           ;;<br>-   FreeBSD*)<br>-            MY_AC_VER=<br>-           MY_AM_VER=<br>-           ;;<br>-   NetBSD*)<br>-             MY_AC_VER=<br>-           MY_AM_VER=<br>-           ;;<br>-   OpenBSD*)<br>-            # pkg_add autoconf%2.63 automake%1.9 metaauto<br>-                [ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.63<br>-         [ -z "$AUTOMAKE_VERSION" ] && export AUTOMAKE_VERSION=1.9<br>-          ;;<br>-   *'BSD'*)<br>-             MY_AC_VER=-2.62<br>-              MY_AM_VER=-1.9<br>-               ;;<br>-   *'SunOS '*)<br>-          MY_AC_VER=<br>-           MY_AM_VER=-1.9<br>-               ;;<br>-   *)<br>-           MY_AC_VER=<br>-           MY_AM_VER=<br>-           AUTOCONF_VERSION=2.60<br>-                AUTOMAKE_VERSION=1.9<br>-         export AUTOCONF_VERSION<br>-              export AUTOMAKE_VERSION<br>-              ;;<br>-esac<br>-<br>-check_for_app autoconf${MY_AC_VER}<br>-check_for_app autoheader${MY_AC_VER}<br>-check_for_app automake${MY_AM_VER}<br>-check_for_app aclocal${MY_AM_VER}<br>+check_for_app autoconf<br>+check_for_app autoheader<br>+check_for_app automake<br>+check_for_app aclocal<br> <br> gen_configure() {<br>         echo "Generating the configure script for $1 ..."<br>   shift<br> <br>-     aclocal${MY_AM_VER} -I "$@"<br>-        autoconf${MY_AC_VER}<br>- autoheader${MY_AC_VER}<br>-       automake${MY_AM_VER} --add-missing --copy 2>/dev/null<br>+     aclocal -I "$@"<br>+    autoconf<br>+     autoheader<br>+   automake --add-missing --copy 2>/dev/null<br> }<br> <br>-gen_configure "Asterisk" autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`<br>+gen_configure "Asterisk" autoconf `find third-party -path '*/*/*' -prune -o -type d -print | xargs -I {} echo -I {}`<br> cd menuselect<br> gen_configure "menuselect" ../autoconf<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9238">change 9238</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/9238"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id4cf433a1a7fa861d0210e1a2e16ca592b49fd5a </div>
<div style="display:none"> Gerrit-Change-Number: 9238 </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>