Add AC_CONFIG_MACRO_DIR([m4]), re-add ACLOCAL_AMFLAGS

Fixes warning:
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/Makefile.am b/Makefile.am
index 13e9ee5187939da5b4faa18a87b03b6920e11c37..3dac293e0fa3db61df289878249363bc9c146d35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS=-I m4
 INCLUDES = -I$(top_builddir)/urcu
 
 AM_LDFLAGS=-lpthread

diff --git a/configure.ac b/configure.ac
index 3a2674753b16bb4163cff611937c59e85744506f..a87efb1a2ae53d10c5793dd0262cb6165f5c624a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([urcu.h])
 AC_PROG_MKDIR_P
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADERS([config.h urcu/config.h])