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>
This commit is contained in:
Daniel Martin 2013-07-25 10:56:30 +02:00
parent 6746ab1549
commit cbe54c97b3
4 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
aclocal.m4 aclocal.m4
build-aux build-aux
libtool libtool
m4/l*.m4
mkinstalldirs mkinstalldirs
config.h config.h
config.h.in config.h.in

View File

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS=src tests doc SUBDIRS=src tests doc
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

View File

@ -7,6 +7,7 @@ AC_INIT([libxcb],
1.9, 1.9,
[xcb@lists.freedesktop.org]) [xcb@lists.freedesktop.org])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([xcb.pc.in]) AC_CONFIG_SRCDIR([xcb.pc.in])
# Initialize Automake # Initialize Automake