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

diff --git a/bootstrap.sh b/bootstrap.sh
index fe39ea203d1bf09d8886593e7f487984a4b4a88d..941dfc996746dbb4ec47ed43cf3bec2c63c1a389 100755 (executable)
--- 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

diff --git a/menuselect/bootstrap.sh b/menuselect/bootstrap.sh
deleted file mode 100755 (executable)
index 8cf5e71..0000000
--- a/menuselect/bootstrap.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-check_for_app() {
-       $1 --version 2>&1 >/dev/null
-       if [ $? != 0 ]
-       then
-               echo "Please install $1 and run bootstrap.sh again!"
-               exit 1
-       fi
-}
-
-uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
-       check_for_app autoconf259
-       check_for_app autoheader259
-       check_for_app automake19
-       check_for_app aclocal19
-       echo "Generating the configure script ..."
-       aclocal19 -I ../autoconf 2>/dev/null
-       autoconf259
-       autoheader259
-       automake19 --add-missing --copy 2>/dev/null
-else
-       AUTOCONF_VERSION=2.59
-       AUTOMAKE_VERSION=1.9
-       export AUTOCONF_VERSION
-       export AUTOMAKE_VERSION
-
-       check_for_app autoconf
-       check_for_app autoheader
-       check_for_app automake
-       check_for_app aclocal
-       echo "Generating the configure script ..."
-       aclocal -I ../autoconf 2>/dev/null
-       autoconf
-       autoheader
-       automake --add-missing --copy 2>/dev/null
-fi
-
-exit 0