[Asterisk-code-review] menuselect: Fix check for running configure. (asterisk[master])
Corey Farrell
asteriskteam at digium.com
Wed Dec 27 20:17:15 CST 2017
Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/7746
Change subject: menuselect: Fix check for running configure.
......................................................................
menuselect: Fix check for running configure.
menuselect/Makefile checks that autoconfig.h and makeopts were newer
than the '.in' files. Unfortunately running ./configure does not touch
autoconfig.h unless the contents will change.
Instead of looking at autoconfig.h we just need to ensure that makeopts
is newer than configure.
Also make change to configure.ac so bootstrap.sh doesn't re-add the
extra trailing line-feed.
Change-Id: Ief1f831d6717007f9cebb668c14e92782cd2b794
---
M menuselect/Makefile
M menuselect/configure.ac
2 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/46/7746/1
diff --git a/menuselect/Makefile b/menuselect/Makefile
index cdd7ebe..c2c9373 100644
--- a/menuselect/Makefile
+++ b/menuselect/Makefile
@@ -64,10 +64,7 @@
$(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h
-makeopts: makeopts.in
-autoconfig.h: autoconfig.h.in
-
-makeopts autoconfig.h:
+makeopts: configure
@./configure $(CONFIGURE_SILENT)
@echo "****"
@echo "**** The configure script was just executed, so 'make' needs to be"
diff --git a/menuselect/configure.ac b/menuselect/configure.ac
index 5945f5c..2dd4ed6 100644
--- a/menuselect/configure.ac
+++ b/menuselect/configure.ac
@@ -61,9 +61,7 @@
#endif
)
-AH_BOTTOM(
-#endif
-)
+AH_BOTTOM([#endif])
# Checks for programs.
AC_PROG_CC
--
To view, visit https://gerrit.asterisk.org/7746
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief1f831d6717007f9cebb668c14e92782cd2b794
Gerrit-Change-Number: 7746
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171227/3fa5e54b/attachment.html>
More information about the asterisk-code-review
mailing list