From d6721e1e4cb1c6e8f072f4a5903f5703b8d62de6 Mon Sep 17 00:00:00 2001 From: Alexander Traud Date: Wed, 20 Jun 2018 20:24:53 +0200 Subject: [PATCH] BuildSystem: Enable autotools in Solaris 11. Because this was the last operating system which required a special case, a version appended to the autotools, the whole version stuff is removed by this change. This simplifies the script ./bootstrap.sh. Hopefully, this gives even broader platform compatibility. ASTERISK-27929 ASTERISK-27926 Change-Id: Id4cf433a1a7fa861d0210e1a2e16ca592b49fd5a --- bootstrap.sh | 59 +++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index baf9474f48..3843c9a964 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -9,61 +9,26 @@ check_for_app() { fi } -# On FreeBSD and OpenBSD, multiple autoconf/automake versions have different names. -# On Linux, environment variables tell which one to use. +# OpenBSD: pkg_add autoconf%2.63 automake%1.9 metaauto +test -n "$AUTOCONF_VERSION" || export AUTOCONF_VERSION=2.63 +test -n "$AUTOMAKE_VERSION" || export AUTOMAKE_VERSION=1.9 -case `uname -sr` in - DragonFly*) - MY_AC_VER= - MY_AM_VER= - ;; - FreeBSD*) - MY_AC_VER= - MY_AM_VER= - ;; - NetBSD*) - MY_AC_VER= - MY_AM_VER= - ;; - OpenBSD*) - # pkg_add autoconf%2.63 automake%1.9 metaauto - [ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.63 - [ -z "$AUTOMAKE_VERSION" ] && export AUTOMAKE_VERSION=1.9 - ;; - *'BSD'*) - MY_AC_VER=-2.62 - MY_AM_VER=-1.9 - ;; - *'SunOS '*) - MY_AC_VER= - MY_AM_VER=-1.9 - ;; - *) - MY_AC_VER= - MY_AM_VER= - AUTOCONF_VERSION=2.60 - AUTOMAKE_VERSION=1.9 - export AUTOCONF_VERSION - export AUTOMAKE_VERSION - ;; -esac - -check_for_app autoconf${MY_AC_VER} -check_for_app autoheader${MY_AC_VER} -check_for_app automake${MY_AM_VER} -check_for_app aclocal${MY_AM_VER} +check_for_app autoconf +check_for_app autoheader +check_for_app automake +check_for_app aclocal gen_configure() { echo "Generating the configure script for $1 ..." shift - aclocal${MY_AM_VER} -I "$@" - autoconf${MY_AC_VER} - autoheader${MY_AC_VER} - automake${MY_AM_VER} --add-missing --copy 2>/dev/null + aclocal -I "$@" + autoconf + autoheader + automake --add-missing --copy 2>/dev/null } -gen_configure "Asterisk" autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}` +gen_configure "Asterisk" autoconf `find third-party -path '*/*/*' -prune -o -type d -print | xargs -I {} echo -I {}` cd menuselect gen_configure "menuselect" ../autoconf