Use m4 directory
authorDaniel Martin <consume.noise@gmail.com>
Thu, 25 Jul 2013 08:56:30 +0000 (10:56 +0200)
committerDaniel Martin <consume.noise@gmail.com>
Wed, 14 Aug 2013 22:35:08 +0000 (00:35 +0200)
- 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>
.gitignore
Makefile.am
configure.ac
m4/xcb.m4 [moved from acinclude.m4 with 100% similarity]

index 046e7f5..c0dc485 100644 (file)
@@ -1,6 +1,7 @@
 aclocal.m4
 build-aux
 libtool
+m4/l*.m4
 mkinstalldirs
 config.h
 config.h.in
index 1f88b72..961595b 100644 (file)
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS=-I m4
+
 SUBDIRS=src tests doc
 
 pkgconfigdir = $(libdir)/pkgconfig
index 1aff958..6c107bc 100644 (file)
@@ -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
similarity index 100%
rename from acinclude.m4
rename to m4/xcb.m4