Merge "BuildSystem: Allow newer autotools on OpenBSD."
authorJoshua Colp <jcolp@digium.com>
Tue, 20 Feb 2018 12:20:52 +0000 (06:20 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 20 Feb 2018 12:20:52 +0000 (06:20 -0600)
bootstrap.sh

index 941dfc9..1ceb326 100755 (executable)
@@ -18,8 +18,9 @@ case `uname -sr` in
                MY_AM_VER=
                ;;
        OpenBSD*)
-               export AUTOCONF_VERSION=2.63
-               export AUTOMAKE_VERSION=1.9
+               # 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