From 946e7298b6db2e1821ef6a89af79c9529893fa9a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 4 Jan 2010 20:54:12 +0000 Subject: Use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libtoolize(1) tool suggests adding AC_CONFIG_MACRO_DIR macro to configure.ac, and gtkdocize tool also uses AC_CONFIG_MACRO_DIR from configure.ac to find out where to install gtk-doc.m4 file. According to libtool documentation at http://www.gnu.org/software/libtool/manual/html_node/Invoking-libtoolize.html "If libtoolize detects an explicit call to AC_CONFIG_MACRO_DIR (see The Autoconf Manual) in your configure.ac, it will put the Libtool macros in the specified directory. In the future other Autotools will automatically check the contents of AC_CONFIG_MACRO_DIR, but at the moment it is more portable to add the macro directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the tools currently look. If libtoolize doesn't see AC_CONFIG_MACRO_DIR, it too will honour the first ‘-I’ argument in ACLOCAL_AMFLAGS when choosing a directory to store libtool configuration macros in. It is perfectly sensible to use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS, as long as they are kept in synchronisation." Fixed #25927 --- Makefile.am | 2 +- configure.ac | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a6cf4ef..906bd25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,5 +19,5 @@ BUILT_SOURCES=liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc CLEANFILES = liboil-$(LIBOIL_MAJORMINOR).pc liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc -ACLOCAL_FLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 9fb75c8..835e5d0 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,7 @@ AC_PROG_LIBTOOL AM_PROG_AS AC_CONFIG_SRCDIR([liboil/liboil.h]) - -ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" -AC_SUBST(ACLOCAL_AMFLAGS) +AC_CONFIG_MACRO_DIR([m4]) PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes, HAVE_GLIB=no) AC_SUBST(GLIB_LIBS) -- cgit v1.2.1