<p>Corey Farrell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8246">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Use single bootstrap.sh for Asterisk and menuselect.<br><br>This causes the root bootstrap.sh script to generate configure scripts<br>for both Asterisk and menuselect.  This ensures that both configure<br>scripts are generated with the same version of autotools and avoids<br>situations where shared autoconf macros get modified without<br>regenerating the menuselect script.<br><br>Change-Id: I2bfd8537bbb63b3d46b11efabbb15eaaf9ef731a<br>---<br>M bootstrap.sh<br>D menuselect/bootstrap.sh<br>2 files changed, 12 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/46/8246/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bootstrap.sh b/bootstrap.sh<br>index fe39ea2..941dfc9 100755<br>--- a/bootstrap.sh<br>+++ b/bootstrap.sh<br>@@ -44,11 +44,18 @@<br> check_for_app automake${MY_AM_VER}<br> check_for_app aclocal${MY_AM_VER}<br> <br>-echo "Generating the configure script ..."<br>+gen_configure() {<br>+   echo "Generating the configure script for $1 ..."<br>+  shift<br> <br>-aclocal${MY_AM_VER} -I autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`<br>-autoconf${MY_AC_VER}<br>-autoheader${MY_AC_VER}<br>-automake${MY_AM_VER} --add-missing --copy 2>/dev/null<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>+}<br>+<br>+gen_configure "Asterisk" autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`<br>+cd menuselect<br>+gen_configure "menuselect" ../autoconf<br> <br> exit 0<br>diff --git a/menuselect/bootstrap.sh b/menuselect/bootstrap.sh<br>deleted file mode 100755<br>index 8cf5e71..0000000<br>--- a/menuselect/bootstrap.sh<br>+++ /dev/null<br>@@ -1,41 +0,0 @@<br>-#!/bin/sh<br>-<br>-check_for_app() {<br>-    $1 --version 2>&1 >/dev/null<br>-       if [ $? != 0 ]<br>-       then<br>-         echo "Please install $1 and run bootstrap.sh again!"<br>-               exit 1<br>-       fi<br>-}<br>-<br>-uname -s | grep -q FreeBSD<br>-if [ $? = 0 ]<br>-then<br>-        check_for_app autoconf259<br>-    check_for_app autoheader259<br>-  check_for_app automake19<br>-     check_for_app aclocal19<br>-      echo "Generating the configure script ..."<br>- aclocal19 -I ../autoconf 2>/dev/null<br>-      autoconf259<br>-  autoheader259<br>-        automake19 --add-missing --copy 2>/dev/null<br>-else<br>-        AUTOCONF_VERSION=2.59<br>-        AUTOMAKE_VERSION=1.9<br>- export AUTOCONF_VERSION<br>-      export AUTOMAKE_VERSION<br>-<br>-   check_for_app autoconf<br>-       check_for_app autoheader<br>-     check_for_app automake<br>-       check_for_app aclocal<br>-        echo "Generating the configure script ..."<br>- aclocal -I ../autoconf 2>/dev/null<br>-        autoconf<br>-     autoheader<br>-   automake --add-missing --copy 2>/dev/null<br>-fi<br>-<br>-exit 0<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8246">change 8246</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/8246"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2bfd8537bbb63b3d46b11efabbb15eaaf9ef731a </div>
<div style="display:none"> Gerrit-Change-Number: 8246 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>