From 648f06ab7b1fdce21e749865cb211775ecfeef40 Mon Sep 17 00:00:00 2001
From: randy-waterhouse <kiwigb@yahoo.com>
Date: Thu, 6 Oct 2016 17:01:26 +1300
Subject: [PATCH] Added AC_CONFIG_MACRO_DIR([build-aux/m4])' to configure.ac.
 Keep the correct libtool macros in-tree.

---
 .gitignore         | 21 ++++++++++-----------
 Makefile.am        |  2 ++
 build-aux/m4/.null |  0
 configure.ac       |  3 ++-
 4 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 build-aux/m4/.null

diff --git a/.gitignore b/.gitignore
index 44cf2ea..0fd4156 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,19 @@
 *.pc
 *.la
 *.o
-libtool
-ltmain.sh
-missing
-install-sh
-depcomp
-configure
-config.*
 *.lo
-autom4te.cache
-ar-lib
-test-driver
-aclocal.m4
 Makefile
+
+# autoreconf
 Makefile.in
+aclocal.m4
+autom4te.cache/
+build-aux/
+config.log
+config.status
+configure
+libtool
+
 .deps
 *.log
 .libs
diff --git a/Makefile.am b/Makefile.am
index 8710d74..c66dfba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the standard MIT license.  See COPYING for more details.
 
+ACLOCAL_AMFLAGS = -I build-aux/m4
+
 lib_LTLIBRARIES = libbase58.la
 libbase58_la_SOURCES = base58.c
 libbase58_la_LDFLAGS = -version-info $(LIBBASE58_SO_VERSION) -no-undefined
diff --git a/build-aux/m4/.null b/build-aux/m4/.null
new file mode 100644
index 0000000..e69de29
diff --git a/configure.ac b/configure.ac
index b7ed159..b069980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,8 @@ AC_INIT(
 	[0.1.4],
 	[luke_libbase58@dashjr.org],
 	[libbase58])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.11 -Wall dist-xz foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])