From 525c0251c0b043b02c27465404155c6479247396 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Fri, 16 Feb 2018 18:58:35 -0500
Subject: [PATCH] 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 ++++++++++++-----
menuselect/bootstrap.sh | 41 -----------------------------------------
2 files changed, 12 insertions(+), 46 deletions(-)
delete mode 100755 menuselect/bootstrap.sh
diff --git a/bootstrap.sh b/bootstrap.sh
index fe39ea203d..941dfc9967 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
diff --git a/menuselect/bootstrap.sh b/menuselect/bootstrap.sh
deleted file mode 100755
index 8cf5e71269..0000000000
--- 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
--
GitLab