summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeán de Búrca <leftmostcat@gmail.com>2013-08-26 06:47:13 -0400
committerColin Walters <walters@verbum.org>2013-08-26 06:47:13 -0400
commit207fdd4a342a2e9d0891c4c8b1e6b14aedf55df6 (patch)
treea8d46d5d6c7ec6d306755440f8a6177747c09e35
parentcb242318d468517a981420516eaadf4e2b72cdbd (diff)
downloadmutter-207fdd4a342a2e9d0891c4c8b1e6b14aedf55df6.tar.gz
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 56c7c888f..223b44bdc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
SUBDIRS=src po doc
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
EXTRA_DIST = HACKING MAINTAINERS rationales.txt
DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
diff --git a/configure.ac b/configure.ac
index 7ea4930e9..4d1875ffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,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)