diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2010-01-04 20:54:12 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2010-02-04 12:20:13 -0800 |
| commit | 946e7298b6db2e1821ef6a89af79c9529893fa9a (patch) | |
| tree | 60296c1b0e559757b7f5b08d2409b8e244c45ac6 | |
| parent | 2c13c258328321f92e7e1a40fe34506e8c855120 (diff) | |
| download | liboil-946e7298b6db2e1821ef6a89af79c9529893fa9a.tar.gz | |
Use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS
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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | 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) |