diff options
| author | Joshua Colp <jcolp@digium.com> | 2018-02-20 06:20:52 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-02-20 06:20:52 -0600 |
| commit | fcf94941122ded90dd34d535cf1a1d2992bd69ee (patch) | |
| tree | ce54987b843f948424c6c9bcf4fa7cb93aee26e9 /bootstrap.sh | |
| parent | fd353237f0fe9d1793c4613d69180185d20cb738 (diff) | |
| parent | 14796f529eb41b0ffda3435b5bd8d2e661622e6e (diff) | |
Merge "BuildSystem: Allow newer autotools on OpenBSD."
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 941dfc996..1ceb326a0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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 |