Skip to content

Commit

Permalink
Make Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
fl0wd3v committed May 30, 2017
1 parent a2e77f4 commit cc3bbf3
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 9,205 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ cov: test_credits.coverage/.dirstamp total.coverage/.dirstamp
endif

# Credits: disable the test until upstream switches from convoluted comparison tool
# Ref https://github.com/credits/credits/issues/4545
# Ref https://github.com/bitcoin/bitcoin/issues/4545
if USE_COMPARISON_TOOL
check-local:
## $(MKDIR_P) qa/tmp
Expand Down
10 changes: 5 additions & 5 deletions build-aux/m4/credits_find_bdb48.m4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_DEFUN([DYNAMIC_FIND_BDB48],[
AC_DEFUN([CREDITS_FIND_BDB48],[
AC_MSG_CHECKING([for Berkeley DB C++ headers])
BDB_CPPFLAGS=
BDB_LIBS=
Expand Down Expand Up @@ -38,16 +38,16 @@ AC_DEFUN([DYNAMIC_FIND_BDB48],[
done
if test "x$bdbpath" = "xX"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([libdb_cxx headers missing, Dynamic requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
AC_MSG_ERROR([libdb_cxx headers missing, Credits requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
elif test "x$bdb48path" = "xX"; then
DYNAMIC_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
CREDITS_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
AC_MSG_WARN([Found Berkeley DB other than 4.8; wallets opened by this build will not be portable!])
],[
AC_MSG_ERROR([Found Berkeley DB other than 4.8, required for portable wallets (--with-incompatible-bdb to ignore or --disable-wallet to disable wallet functionality)])
])
else
DYNAMIC_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
CREDITS_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
bdbpath="${bdb48path}"
fi
AC_SUBST(BDB_CPPFLAGS)
Expand All @@ -60,7 +60,7 @@ AC_DEFUN([DYNAMIC_FIND_BDB48],[
])
done
if test "x$BDB_LIBS" = "x"; then
AC_MSG_ERROR([libdb_cxx missing, Dynamic requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
AC_MSG_ERROR([libdb_cxx missing, Credits requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
fi
AC_SUBST(BDB_LIBS)
])
Loading

0 comments on commit cc3bbf3

Please sign in to comment.