Minor fixups for autotools: use older aclocal options for arcade chroot, override...

conflicts: autogen.sh (source: 993f416393af9e6f8fe64091ec7385e4f9d5ccb9)

diff --git a/autogen.sh b/autogen.sh
index 2cd4f71..b9316bd 100755 (executable)
--- 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 0d56504..6966ce2 100644 (file)
--- 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"