From 906ccc3901871c434ee4b10cd84384a781fbeb88 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Tue, 26 Jan 2016 12:47:58 +1100
Subject: [PATCH] autogen.sh: Improve autoconf/automake detection on OpenBSD

OpenBSD needs the enviroment variables `AUTOCONF_VERSION` and
`AUTOMAKE_VERSION` to be set in order to find these tools.

The script now tests (individually) if they are already set and if they
aren't sets them to something that is known to work on OpenBSD 5.8
---
 autogen.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index b62a3401..491d3557 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,10 +40,20 @@ set -e
 
 if test $(uname -s) = "OpenBSD" ; then
 	# OpenBSD needs these environment variables set.
-	AUTOCONF_VERSION=2.69
-	AUTOMAKE_VERSION=1.11
-	export AUTOCONF_VERSION
-	export AUTOMAKE_VERSION
+	if test -z "$AUTOCONF_VERSION" ; then
+		AUTOCONF_VERSION=2.69
+		export AUTOCONF_VERSION
+		echo "Defaulting to use AUTOCONF_VERSION version ${AUTOCONF_VERSION}."
+	else
+		echo "Using AUTOCONF_VERSION version ${AUTOCONF_VERSION}."
+		fi
+	if test -z "$AUTOMAKE_VERSION" ; then
+		AUTOMAKE_VERSION=1.15
+		export AUTOMAKE_VERSION
+		echo "Defaulting to use AUTOMAKE_VERSION version ${AUTOMAKE_VERSION}."
+	else
+		echo "Using AUTOMAKE_VERSION version ${AUTOMAKE_VERSION}."
+		fi
 	fi
 
 srcdir=`dirname $0`