diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-08 16:58:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-08 16:59:47 +0100 |
| commit | aefc43ba5c2688a1301dcda08b56a42127904cbb (patch) | |
| tree | edca9dccef5265fc0ab1f7ad3a6442f2466bbc95 | |
| parent | 5f6fcb4e7c8c273ca4a0211bf1b6f99a20ef5feb (diff) | |
autogen.sh: better error message when src_path contains spaces
Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rwxr-xr-x | autogen.sh | 3 |
2 files changed, 4 insertions, 0 deletions
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'; |