[PATCH weston 02/11] autotools: Search for .m4 files in m4/

Quentin Glidic sardemff7+wayland at sardemff7.net
Sun Dec 8 10:45:34 PST 2013


From: Quentin Glidic <sardemff7+git at sardemff7.net>

It allows libtool to distribute its m4 files and the user to override
its system ones if needed

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 Makefile.am  | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 38b6ad6..43fd307 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
 
 if BUILD_WCAP_TOOLS
diff --git a/configure.ac b/configure.ac
index 86940d5..40ae145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version])
 AC_SUBST([WESTON_VERSION], [weston_version])
 
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
-- 
1.8.4.3



More information about the wayland-devel mailing list