From aefc43ba5c2688a1301dcda08b56a42127904cbb Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Sun, 8 Mar 2015 16:58:35 +0100
Subject: [PATCH] autogen.sh: better error message when src_path contains
 spaces

Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32
---
 Makefile.in | 1 +
 autogen.sh  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index b4c1ecfdf6e0..36bcaf3f752d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
 		$(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \
 		$(BUILDDIR)/autogen.input \
 		$(BUILDDIR)/autogen.lastrun \
+		$(BUILDDIR)/autogen.sh \
 		)
 	sh -c $(SRCDIR)/autogen.sh
 
diff --git a/autogen.sh b/autogen.sh
index cdf4e768f939..ab9c94d3f165 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -116,6 +116,9 @@ sub invalid_distro($$)
     closedir ($dirh);
 }
 
+# Avoid confusing "aclocal: error: non-option arguments are not accepted: '.../m4'." error message.
+die "\$src_path must not contain spaces, but it is '$src_path'." if ($src_path =~ / /);
+
 # Alloc $ACLOCAL to specify which aclocal to use
 $aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';