<p>Richard Mudgett <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7746">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Richard Mudgett: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">menuselect: Fix check for running configure.<br><br>menuselect/Makefile checks that autoconfig.h and makeopts were newer<br>than the '.in' files. Unfortunately running ./configure does not touch<br>autoconfig.h unless the contents will change.<br><br>Instead of looking at autoconfig.h we just need to ensure that makeopts<br>is newer than configure.<br><br>Also make change to configure.ac so bootstrap.sh doesn't re-add the<br>extra trailing line-feed.<br><br>Change-Id: Ief1f831d6717007f9cebb668c14e92782cd2b794<br>---<br>M menuselect/Makefile<br>M menuselect/configure.ac<br>2 files changed, 2 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/menuselect/Makefile b/menuselect/Makefile<br>index cdd7ebe..c2c9373 100644<br>--- a/menuselect/Makefile<br>+++ b/menuselect/Makefile<br>@@ -64,10 +64,7 @@<br> <br> $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h<br> <br>-makeopts: makeopts.in<br>-autoconfig.h: autoconfig.h.in<br>-<br>-makeopts autoconfig.h:<br>+makeopts: configure<br> @./configure $(CONFIGURE_SILENT)<br> @echo "****"<br> @echo "**** The configure script was just executed, so 'make' needs to be"<br>diff --git a/menuselect/configure.ac b/menuselect/configure.ac<br>index 5945f5c..2dd4ed6 100644<br>--- a/menuselect/configure.ac<br>+++ b/menuselect/configure.ac<br>@@ -61,9 +61,7 @@<br> #endif<br> )<br> <br>-AH_BOTTOM(<br>-#endif<br>-)<br>+AH_BOTTOM([#endif])<br> <br> # Checks for programs.<br> AC_PROG_CC<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7746">change 7746</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/7746"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ief1f831d6717007f9cebb668c14e92782cd2b794 </div>
<div style="display:none"> Gerrit-Change-Number: 7746 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.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: Richard Mudgett <rmudgett@digium.com> </div>