diff options
| author | Daniel Martin <consume.noise@gmail.com> | 2013-07-25 10:56:30 +0200 |
|---|---|---|
| committer | Daniel Martin <consume.noise@gmail.com> | 2013-08-15 00:35:08 +0200 |
| commit | cbe54c97b3f0e4d40e0ee18796f8077cb4a6c16a (patch) | |
| tree | 734447c8a26df754bdb8723767cee70ab0dcba74 | |
| parent | 6746ab1549d34a146c8383ed5acdabf0d48c1889 (diff) | |
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 <consume.noise@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Tested-By: Ran Benita <ran234@gmail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/xcb.m4 (renamed from acinclude.m4) | 0 |
4 files changed, 4 insertions, 0 deletions
@@ -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 |