Browse Source

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)
pull/1/head
Wladimir J. van der Laan 9 years ago
parent
commit
6893d74e15
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      autogen.sh
  2. 6
      configure.ac
  3. 3
      src/Makefile.am

6
autogen.sh

@ -1 +1,5 @@ @@ -1 +1,5 @@
autoreconf -vif
#!/bin/sh
set -e
srcdir="$(dirname $0)"
cd "$srcdir"
autoreconf --install --force

6
configure.ac

@ -376,7 +376,11 @@ fi @@ -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

3
src/Makefile.am

@ -135,5 +135,4 @@ EXTRA_DIST = leveldb Makefile.include @@ -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

Loading…
Cancel
Save