Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated more /depends/packages based on upstream changes from bitcoin…
…-core
- Loading branch information
Showing
7 changed files
with
85 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,74 @@ | ||
| AC_DEFUN([NAVCOIN_FIND_BDB48],[ | ||
| AC_MSG_CHECKING([for Berkeley DB C++ headers]) | ||
| BDB_CPPFLAGS= | ||
| BDB_LIBS= | ||
| bdbpath=X | ||
| bdb48path=X | ||
| bdbdirlist= | ||
| for _vn in 4.8 48 4 5 ''; do | ||
| for _pfx in b lib ''; do | ||
| bdbdirlist="$bdbdirlist ${_pfx}db${_vn}" | ||
| AC_ARG_VAR(BDB_CFLAGS, [C compiler flags for BerkeleyDB, bypasses autodetection]) | ||
| AC_ARG_VAR(BDB_LIBS, [Linker flags for BerkeleyDB, bypasses autodetection]) | ||
| if test "x$BDB_CFLAGS" = "x"; then | ||
| AC_MSG_CHECKING([for Berkeley DB C++ headers]) | ||
| BDB_CPPFLAGS= | ||
| bdbpath=X | ||
| bdb48path=X | ||
| bdbdirlist= | ||
| for _vn in 4.8 48 4 5 5.3 ''; do | ||
| for _pfx in b lib ''; do | ||
| bdbdirlist="$bdbdirlist ${_pfx}db${_vn}" | ||
| done | ||
| done | ||
| done | ||
| for searchpath in $bdbdirlist ''; do | ||
| test -n "${searchpath}" && searchpath="${searchpath}/" | ||
| AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| #include <${searchpath}db_cxx.h> | ||
| ]],[[ | ||
| #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4) | ||
| #error "failed to find bdb 4.8+" | ||
| #endif | ||
| ]])],[ | ||
| if test "x$bdbpath" = "xX"; then | ||
| bdbpath="${searchpath}" | ||
| fi | ||
| ],[ | ||
| continue | ||
| ]) | ||
| AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| #include <${searchpath}db_cxx.h> | ||
| ]],[[ | ||
| #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8) | ||
| #error "failed to find bdb 4.8" | ||
| #endif | ||
| ]])],[ | ||
| bdb48path="${searchpath}" | ||
| break | ||
| ],[]) | ||
| done | ||
| if test "x$bdbpath" = "xX"; then | ||
| AC_MSG_RESULT([no]) | ||
| AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) | ||
| elif test "x$bdb48path" = "xX"; then | ||
| NAVCOIN_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)]) | ||
| ]) | ||
| for searchpath in $bdbdirlist ''; do | ||
| test -n "${searchpath}" && searchpath="${searchpath}/" | ||
| AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| #include <${searchpath}db_cxx.h> | ||
| ]],[[ | ||
| #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4) | ||
| #error "failed to find bdb 4.8+" | ||
| #endif | ||
| ]])],[ | ||
| if test "x$bdbpath" = "xX"; then | ||
| bdbpath="${searchpath}" | ||
| fi | ||
| ],[ | ||
| continue | ||
| ]) | ||
| AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| #include <${searchpath}db_cxx.h> | ||
| ]],[[ | ||
| #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8) | ||
| #error "failed to find bdb 4.8" | ||
| #endif | ||
| ]])],[ | ||
| bdb48path="${searchpath}" | ||
| break | ||
| ],[]) | ||
| done | ||
| if test "x$bdbpath" = "xX"; then | ||
| AC_MSG_RESULT([no]) | ||
| AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) | ||
| elif test "x$bdb48path" = "xX"; then | ||
| NAVCOIN_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 | ||
| NAVCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) | ||
| bdbpath="${bdb48path}" | ||
| fi | ||
| else | ||
| NAVCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) | ||
| bdbpath="${bdb48path}" | ||
| BDB_CPPFLAGS=${BDB_CFLAGS} | ||
| fi | ||
| AC_SUBST(BDB_CPPFLAGS) | ||
| # TODO: Ideally this could find the library version and make sure it matches the headers being used | ||
| for searchlib in db_cxx-4.8 db_cxx; do | ||
| AC_CHECK_LIB([$searchlib],[main],[ | ||
| BDB_LIBS="-l${searchlib}" | ||
| break | ||
| ]) | ||
| done | ||
| if test "x$BDB_LIBS" = "x"; then | ||
| AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) | ||
| # TODO: Ideally this could find the library version and make sure it matches the headers being used | ||
| for searchlib in db_cxx-4.8 db_cxx db4_cxx; do | ||
| AC_CHECK_LIB([$searchlib],[main],[ | ||
| BDB_LIBS="-l${searchlib}" | ||
| break | ||
| ]) | ||
| done | ||
| if test "x$BDB_LIBS" = "x"; then | ||
| AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) | ||
| fi | ||
| fi | ||
| AC_SUBST(BDB_LIBS) | ||
| ]) |
Empty file.