From 43c67229ba9e858f2413cc3e331a55a821ac253f Mon Sep 17 00:00:00 2001
From: Marc Cannon <vyhdycokio@gmail.com>
Date: Fri, 25 Jan 2013 19:24:53 -0500
Subject: [PATCH] Minor fixups for autotools: use older aclocal options for
 arcade chroot, override chroot's Git revision date with the current date if
 we can't get YYYY-MM-DD

conflicts: autogen.sh (source: 993f416393af9e6f8fe64091ec7385e4f9d5ccb9)
---
 autogen.sh   |  2 ++
 configure.ac | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 2cd4f71c..b9316bd1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,12 +40,14 @@ DIE=0
 }
 
 # Try automake-1.9, 1.8, and 1.7.
+# HACK: automake 1.7/1.8 choke without a space after -I. Override here.
 if automake-1.9 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.9
         AUTOMAKE=automake-1.9
 elif automake-1.8 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.8
         AUTOMAKE=automake-1.8
+		ACLOCAL_OPTIONS="-I autoconf/m4/"
 elif automake-1.7 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.7
         AUTOMAKE=automake-1.7
diff --git a/configure.ac b/configure.ac
index 0d565044..6966ce26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,6 +338,16 @@ if test "$have_git_repo" = "yes"; then
 		build_version="$build_version DEV"
 	fi
 
+	# HACK: the arcade chroot's git version is too old to understand our
+	# desired YYYY-MM-DD format. If we don't get a date in that format,
+	# fall back to today's date.
+
+	# HACK x2 COMBO!!: 'expr', in bash 2.05, doesn't seem to parse
+	# {n} for matching n repeats, hence the brain-dead regex.
+
+	if ! [ expr "$build_rev_date" : '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$' > /dev/null ]; then
+		build_rev_date=`date +%Y-%m-%d`
+	fi
 else
 	build_version="unknown version"
 	build_rev_date="unknown date"
-- 
2.11.0