summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeán de Búrca <leftmostcat@gmail.com>2013-08-26 06:47:13 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-04-09 12:28:45 -0700
commit814b2dbda91ecf33315bacf3e8f0f1e4f679a947 (patch)
tree3638c96c0b7867710bc0b328a323b5fa550fc588
parentebbdfabed6922b650796a882324560441574d0c7 (diff)
build: Create m4 directory
Due to changes in gnome-common git, an implicit m4 directory is no longer created during autogen. The attached patch explicitly and correctly specifies a macro directory. https://bugzilla.gnome.org/show_bug.cgi?id=706787
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0529c400..b55c1d14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
SUBDIRS=src po doc
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 180af409..3f91c7e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ m4_define([mutter_plugin_api_version], [3])
AC_INIT([mutter], [mutter_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/core/display.c)
AC_CONFIG_HEADERS(config.h)