From 25e3c9cf9d1d65fa173fdfbd4fef709c48fb3bf2 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 9 Feb 2011 14:19:54 +0000
Subject: [PATCH] Some versions of m4 do not honour M4PATH even if claiming to.
 Manually add its contents to the aclocal commandline flags.

---
 bootstrap | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bootstrap b/bootstrap
index 5752522e..9bfd3fac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -112,6 +112,17 @@ if test -n "$auxdir"; then
   aclocalflags="${aclocalflags} -I $auxdir -I ."
 fi
 
+# Honour M4PATH because sometimes M4 doesn't
+save_IFS=$IFS
+IFS=:
+tmp="$M4PATH"
+for x in "$tmp"; do
+  if test -n "$x"; then
+    aclocalflags="${aclocalflags} -I $x"
+  fi
+done
+IFS=$save_IFS
+
 # Explain what we are doing from now
 set -x