From 2fea683ca1a391690f6fc2b3a94bc0e4b1a5df49 Mon Sep 17 00:00:00 2001
From: Nate Bargmann <n0nb@n0nb.us>
Date: Sat, 13 Oct 2012 19:09:46 -0500
Subject: [PATCH] Install build files rather than symlink

Previously, invoking autogen.sh would create symbolic links to needed
Autotools files in the tree only when working from a Git checkout
(source distributions have the files included).  Consideration of this
included the possibility of bugs if the Autotools packages were upgraded
on the developer's system that strange bugs could result.  Copying the
files means the tree is self contained until the next time autoreconf or
autogen.sh is run.

The top level Makefile.am included the variable $(subdirs) in both
SUBDIRS and DIST_SUBDIRS assignments.  While this variable may contain a
useful value, it is undocumented in the manuals.  Relying on it may
result in some directory being ommitted or other changes in the future,
so removing it from the assignments.
---
 .gitignore  |  1 +
 Makefile.am | 14 ++++++++------
 autogen.sh  |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5410db9d7..2fee53200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ macros/ltsugar.m4
 macros/ltdl.m4
 macros/ltversion.m4
 macros/lt~obsolete.m4
+macros/pkg.m4
 rpcrig/rpc.rigd
 rpcrig/rpcrig.h
 rpcrig/rpcrig_clnt.c
diff --git a/Makefile.am b/Makefile.am
index d9766144f..e16ac183b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,15 +9,17 @@ pkgconfig_DATA = hamlib.pc
 EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
 	README.betatester README.win32
 
-# BINDINGS_LIST subdirs are no longer built
-SUBDIRS = libltdl macros include lib $(subdirs) src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
-			@BINDINGS@ tests doc
+SUBDIRS = libltdl macros include lib src \
+	@BACKEND_LIST@ \
+	@ROT_BACKEND_LIST@ \
+	@BINDINGS@ \
+	tests doc
 
-# perl and kylix subdirs are no longer distributed
-DIST_SUBDIRS = macros include lib $(subdirs) src c++ bindings tests doc \
+DIST_SUBDIRS = libltdl macros include lib src c++ bindings tests doc \
 	icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
 	winradio adat easycomm fodtrack drake rotorez \
 	flexradio sartek lowe rft rs tapr kit skanti prm80 wj racal tuner \
 	gs232a heathkit spid ars m2 amsat scripts ts7400 celestron
 
-ACLOCAL_AMFLAGS = -I macros
+# Install any third party macros into our tree for distribution
+ACLOCAL_AMFLAGS = -I macros --install
diff --git a/autogen.sh b/autogen.sh
index 6db98e752..9dd1e7bfd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,11 +64,11 @@ test $TEST_TYPE $FILE || {
 ### subtools are processed in the correct order.                ###
 ###################################################################
 
-echo "Running '$AUTORECONF -is' to process configure.ac"
+echo "Running '$AUTORECONF -i' to process configure.ac"
 echo "and generate the configure script."
 
-# Tell autoreconf to install missing files as symbolic links
-$AUTORECONF -is
+# Tell autoreconf to install needed build system files
+$AUTORECONF -i
 
 cd $ORIGDIR