Merge "BuildSystem: Use single bootstrap.sh for Asterisk and menuselect."

This commit is contained in:
Joshua Colp 2018-02-20 05:11:29 -06:00 committed by Gerrit Code Review
commit c1d523c7b3
2 changed files with 12 additions and 46 deletions

View File

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

View File

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