diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-08 13:56:01 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-08 13:56:12 +0100 |
| commit | 6893d74e1511ee68a8f6ab25f232a66dd3cbe2b6 (patch) | |
| tree | 2feadc59efe566ef22a2607b4f1c931fd5df17bc | |
| parent | 05e27c66411caa622815cc7cc7136dfd85370ab4 (diff) | |
| parent | 26d1b65c532585dfb8c0405af3c56c4217cd1524 (diff) | |
| download | bitcoin-6893d74e1511ee68a8f6ab25f232a66dd3cbe2b6.tar.xz | |
Merge pull request #3322
26d1b65 src/Makefile.am: Simplify clean of leveldb (Josh Triplett)
a26a367 configure.ac: Check for miniupnpc headers, not just -lminiupnpc (Josh Triplett)
82ccb05 autogen.sh: Stop passing --verbose to autoreconf (Josh Triplett)
e12dafd autogen.sh: Use long options to autoreconf, for self-documentation (Josh Triplett)
19b9add autogen.sh: Support running from outside the source directory (Josh Triplett)
97d285a autogen.sh: Use set -e to fail if any command fails (Josh Triplett)
f80b723 autogen.sh: Add a /bin/sh shebang. (Josh Triplett)
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh index 4e7011a596..5b883a6a4c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1 +1,5 @@ -autoreconf -vif +#!/bin/sh +set -e +srcdir="$(dirname $0)" +cd "$srcdir" +autoreconf --install --force diff --git a/configure.ac b/configure.ac index 0f99675fb4..34509993a0 100644 --- a/configure.ac +++ b/configure.ac @@ -376,7 +376,11 @@ fi 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 diff --git a/src/Makefile.am b/src/Makefile.am index 89879d5cd8..df4087c313 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -135,5 +135,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 |