From 525c0251c0b043b02c27465404155c6479247396 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Fri, 16 Feb 2018 18:58:35 -0500 Subject: BuildSystem: Use single bootstrap.sh for Asterisk and menuselect. This causes the root bootstrap.sh script to generate configure scripts for both Asterisk and menuselect. This ensures that both configure scripts are generated with the same version of autotools and avoids situations where shared autoconf macros get modified without regenerating the menuselect script. Change-Id: I2bfd8537bbb63b3d46b11efabbb15eaaf9ef731a --- bootstrap.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'bootstrap.sh') diff --git a/bootstrap.sh b/bootstrap.sh index fe39ea203..941dfc996 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -44,11 +44,18 @@ check_for_app autoheader${MY_AC_VER} check_for_app automake${MY_AM_VER} check_for_app aclocal${MY_AM_VER} -echo "Generating the configure script ..." +gen_configure() { + echo "Generating the configure script for $1 ..." + shift -aclocal${MY_AM_VER} -I autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}` -autoconf${MY_AC_VER} -autoheader${MY_AC_VER} -automake${MY_AM_VER} --add-missing --copy 2>/dev/null + aclocal${MY_AM_VER} -I "$@" + autoconf${MY_AC_VER} + autoheader${MY_AC_VER} + automake${MY_AM_VER} --add-missing --copy 2>/dev/null +} + +gen_configure "Asterisk" autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}` +cd menuselect +gen_configure "menuselect" ../autoconf exit 0 -- cgit v1.2.3