From cbe54c97b3f0e4d40e0ee18796f8077cb4a6c16a Mon Sep 17 00:00:00 2001 From: Daniel Martin Date: Thu, 25 Jul 2013 10:56:30 +0200 Subject: [PATCH] Use m4 directory - Follow the suggestion by libtoolize: "Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and rerunning libtoolize, to keep the correct libtool macros in-tree. Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am." and add the macro and define. - Create the m4 directory and move acinclude.m4 as xcb.m4 there. - Ignore the m4 files libtoolize copies into the m4 directory (m4/l*.m4). Signed-off-by: Daniel Martin Reviewed-by: Alan Coopersmith Reviewed-by: Uli Schlachter Tested-By: Ran Benita --- .gitignore | 1 + Makefile.am | 2 ++ configure.ac | 1 + acinclude.m4 => m4/xcb.m4 | 0 4 files changed, 4 insertions(+) rename acinclude.m4 => m4/xcb.m4 (100%) diff --git a/.gitignore b/.gitignore index 046e7f5..c0dc485 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ aclocal.m4 build-aux libtool +m4/l*.m4 mkinstalldirs config.h config.h.in diff --git a/Makefile.am b/Makefile.am index 1f88b72..961595b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS=-I m4 + SUBDIRS=src tests doc pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 1aff958..6c107bc 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AC_INIT([libxcb], 1.9, [xcb@lists.freedesktop.org]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([xcb.pc.in]) # Initialize Automake diff --git a/acinclude.m4 b/m4/xcb.m4 similarity index 100% rename from acinclude.m4 rename to m4/xcb.m4