[vala/0.14] Do not install vala.m4 with --disable-unversioned

[JÃrg Billeter <juergbi src gnome org>]

commit f20bb5e495cf796cb63f91d1c768ef265e17ed9c
Author: JÃrg Billeter <j bitron ch>
Date:   Thu Dec 15 14:43:48 2011 +0100

    Do not install vala.m4 with --disable-unversioned
    
    This avoids file conflicts with parallel installations.

 Makefile.am |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 943e23d..3a8fc6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,10 @@ DIST_SUBDIRS = \
 	vapigen \
 	$(NULL)
 
+if ENABLE_UNVERSIONED
 aclocaldir = $(datadir)/aclocal
-dist_aclocal_DATA = vala.m4
+aclocal_DATA = vala.m4
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvala PACKAGE_SUFFIX@.pc
@@ -104,6 +106,7 @@ EXTRA_DIST = \
 	ChangeLog.pre-0-5-7 \
 	MAINTAINERS \
 	libvala.pc.in \
+	vala.m4 \
 	.version \
 	build-aux/git-version-gen \
 	build-aux/gitlog-to-changelog \