[master] Put libtool macros in m4macros/

diff --git a/Makefile.am b/Makefile.am
index 55a28aab9448d87e86dc2745749f6309c7e156cb..c90453ace93da65f98bafaeba09fb2aff6d1da3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,7 @@
+ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+# ^^^^^^^^ This has to be the first line and cannot come later in this
+# Makefile.am due to some bork in some versions of autotools.
+
 SUBDIRS = compatcheck doc src tests
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@

diff --git a/configure.ac b/configure.ac
index a35da4ce3126626ac3bb4ef81774185a19339b98..56d2618c86470a987449ae9d53f496ac1527b8a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4macros])
 
 # Checks for programs.
 AC_PROG_CXX

diff --git a/m4macros/.gitignore b/m4macros/.gitignore
new file mode 100644 (file)
index 0000000..464ba5c
--- /dev/null
+++ b/m4macros/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4