From b52cfea76fbf6e269cddcc4f846d8a5946105565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 24 Feb 2016 12:36:33 +0100 Subject: [PATCH] build: add m4 directory Instead of rely on the automatic creation of m4 directory by aclocal, we already control it. Later we could create our own m4 scripts in order to unclutter configure.ac https://bugzilla.gnome.org/show_bug.cgi?id=762528 --- Makefile.am | 4 ++-- configure.ac | 1 + m4/Makefile.am | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 m4/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5db5e1f7d6..87f8a3616e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -ACLOCAL_AMFLAGS = -I m4 -I common/m4 ${ACLOCAL_FLAGS} +ACLOCAL_AMFLAGS = -I m4 -I common/m4 -SUBDIRS = gst-libs gst tests common docs +SUBDIRS = gst-libs gst tests m4 common docs DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc diff --git a/configure.ac b/configure.ac index 65dd2fa8e0..d7c2022046 100644 --- a/configure.ac +++ b/configure.ac @@ -973,6 +973,7 @@ AC_CONFIG_FILES([ Makefile common/Makefile common/m4/Makefile + m4/Makefile docs/Makefile docs/version.entities docs/plugins/Makefile diff --git a/m4/Makefile.am b/m4/Makefile.am new file mode 100644 index 0000000000..af864e3bbb --- /dev/null +++ b/m4/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = $(wildcard *.m4)