From fc40cbe071d8952a5de324d3cfd34ecd63ae4bac Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 6 Jun 2016 21:55:33 -0400
Subject: autoconf fixup

---
 Makefile     | 20 ++++++++++++++++++++
 configure.ac | 13 +++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8d9fecb1fb..55ce861333 100644
--- a/Makefile
+++ b/Makefile
@@ -25,4 +25,24 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 at.subdirs += src
 
+# intltoolize
+std.gen_files += m4/intltool.m4
+std.gen_files += po/Makefile.in.in
+# autoreconf
+std.gen_files += aclocal.m4
+std.gen_files += automake.mk.in
+std.gen_files += build-aux/compile
+std.gen_files += build-aux/config.guess
+std.gen_files += build-aux/config.sub
+std.gen_files += build-aux/install-sh
+std.gen_files += build-aux/ltmain.sh
+std.gen_files += build-aux/missing
+std.gen_files += m4/libtool.m4
+std.gen_files += m4/ltoptions.m4
+std.gen_files += m4/ltsugar.m4
+std.gen_files += m4/ltversion.m4
+std.gen_files += m4/lt~obsolete.m4
+std.gen_files += config.h.in
+std.gen_files += configure
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/configure.ac b/configure.ac
index a4ffebea06..4e6f37f528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,6 @@ AC_PROG_INSTALL
 AC_PROG_MKDIR_P
 AC_PROG_LEX
 AC_PROG_LN_S
-AC_PROG_RANLIB
 AC_PROG_SED
 AC_PROG_YACC
 
@@ -1516,7 +1515,17 @@ AC_CONFIG_FILES([
         po/Makefile.in
 ])
 
-AC_OUTPUT
+AC_OUTPUT([], [], [
+if test "$srcdir" != .; then
+	{
+		find "$srcdir" -name Makefile -printf '%P\n'
+		find "$srcdir" -name subdir.mk -printf '%P\n'
+	} | while read -r filename; do
+		mkdir -p "\$(dirname "\$filename")"
+		ln -srfT "$srcdir/\$filename" "\$filename"
+	done
+fi
+])
 AC_MSG_RESULT([
         $PACKAGE_NAME $VERSION
 
-- 
cgit v1.2.3-54-g00ecf