From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 30 Apr 2012 04:02:17 +0000 (+0530)
Subject: [master] Put libtool macros in m4macros/
X-Git-Tag: trac2351_base~226^2~116^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9d8efd545fb5bdb5bbab14eac2111ae4e47f75f;p=thirdparty%2Fkea.git

[master] Put libtool macros in m4macros/
---

diff --git a/Makefile.am b/Makefile.am
index 55a28aab94..c90453ace9 100644
--- 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 a35da4ce31..56d2618c86 100644
--- 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
index 0000000000..464ba5caa6
--- /dev/null
+++ b/m4macros/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4