From f80b723c6689773a23600b5a866a10f56565d2b7 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 17:21:40 -0800
Subject: [PATCH 1/7] autogen.sh: Add a /bin/sh shebang.

---
 autogen.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autogen.sh b/autogen.sh
index 4e7011a59..5a29d5f38 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1 +1,2 @@
+#!/bin/sh
 autoreconf -vif

From 97d285ab513abb6d823e97e835a79a516fcced92 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 17:24:26 -0800
Subject: [PATCH 2/7] autogen.sh: Use set -e to fail if any command fails

In preparation for expanding autogen.sh.
---
 autogen.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autogen.sh b/autogen.sh
index 5a29d5f38..3aa140188 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+set -e
 autoreconf -vif

From 19b9adda520daaec0a87f8d7c061e08cdf82fe6b Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 17:25:58 -0800
Subject: [PATCH 3/7] autogen.sh: Support running from outside the source
 directory

Initial steps towards supporting out-of-tree builds.
---
 autogen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 3aa140188..1e68a774a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 set -e
+srcdir="$(dirname $0)"
+cd "$srcdir"
 autoreconf -vif

From e12dafd7bba1182756133b5b58a7765d219b1f2c Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 17:27:16 -0800
Subject: [PATCH 4/7] autogen.sh: Use long options to autoreconf, for
 self-documentation

---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 1e68a774a..b3768882f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,4 +2,4 @@
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
-autoreconf -vif
+autoreconf --verbose --install --force

From 82ccb05b07c111223adbbf54e9da7c2a4a185562 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 17:29:00 -0800
Subject: [PATCH 5/7] autogen.sh: Stop passing --verbose to autoreconf

This quiets down the autotools build, making warnings much more visible.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index b3768882f..5b883a6a4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,4 +2,4 @@
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
-autoreconf --verbose --install --force
+autoreconf --install --force

From a26a3676295689d15cb952cbec822021092e2901 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 18:16:16 -0800
Subject: [PATCH 6/7] configure.ac: Check for miniupnpc headers, not just
 -lminiupnpc

This protects against broken systems which have libminiupnpc.a or
libminiupnpc.so installed but don't have the miniupnpc headers.
---
 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f6d870f33..43a622fea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,11 @@ BITCOIN_FIND_BDB48
 
 dnl Check for libminiupnpc (optional)
 if test x$use_upnp != xno; then
-  AC_CHECK_LIB([miniupnpc], [main],, [have_miniupnpc=no])
+  AC_CHECK_HEADERS(
+    [miniupnpc/miniwget.h miniupnpc/miniupnpc.h miniupnpc/upnpcommands.h miniupnpc/upnperrors.h],
+    [AC_CHECK_LIB([miniupnpc], [main],, [have_miniupnpc=no])],
+    [have_miniupnpc=no]
+  )
 fi
 
 dnl Check for boost libs

From 26d1b65c532585dfb8c0405af3c56c4217cd1524 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Nov 2013 18:17:17 -0800
Subject: [PATCH 7/7] src/Makefile.am: Simplify clean of leveldb

---
 src/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 14d1dd03a..2b75eff95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,5 +85,4 @@ EXTRA_DIST = leveldb Makefile.include
 
 clean-local:
 	-$(MAKE) -C leveldb clean
-	rm -f leveldb/port/*.gcno leveldb/db/*.gcno leveldb/table/*.gcno leveldb/helpers/*.gcno
-	rm -f leveldb/util/*.gcno leveldb/helpers/memenv/*.gcno
+	rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno