summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-02-24 12:36:33 +0100
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-02-24 12:36:33 +0100
commitcc109c8ef378571763e9cb023268c24c05b86fcc (patch)
treeeeb312d60cff7971c5249ce9b44e2ff7659a1ccc
parent11221fe868bb08e0acf046bfa81dc2781c2a2d0c (diff)
downloadgstreamer-vaapi-1.6.tar.gz
build: add m4 directory1.6
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
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rw-r--r--m4/Makefile.am1
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5db5e1f7..87f8a361 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 d2d2b3ec..96e1232a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1003,6 +1003,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 00000000..af864e3b
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.m4)