From: Corey Farrell <git@cfware.com>
Date: Thu, 28 Dec 2017 01:27:18 +0000 (-0500)
Subject: menuselect: Fix check for running configure.
X-Git-Tag: 16.0.0-rc1~482^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6338a03ce93fd56d4127e72d7835089441c759e4;p=thirdparty%2Fasterisk.git

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
---

diff --git a/menuselect/Makefile b/menuselect/Makefile
index cdd7ebedbe..c2c9373f4f 100644
--- a/menuselect/Makefile
+++ b/menuselect/Makefile
@@ -64,10 +64,7 @@ all: $(ALL_TGTS)
 
 $(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 5945f5c9f6..2dd4ed6521 100644
--- a/menuselect/configure.ac
+++ b/menuselect/configure.ac
@@ -61,9 +61,7 @@ AH_TOP(
 #endif
 )
 
-AH_BOTTOM(
-#endif
-)
+AH_BOTTOM([#endif])
 
 # Checks for programs.
 AC_PROG_CC