From a179777a0a0d65fbd05e54123db01a336be96b41 Mon Sep 17 00:00:00 2001 From: vertoe Date: Mon, 16 Feb 2015 23:19:42 +0100 Subject: [PATCH] Rename darkcoin config header. --- .gitignore | 4 ++-- configure.ac | 14 +++++++------- contrib/darkcoin-qt.pro | 2 +- contrib/debian/rules | 2 +- src/clientversion.h | 6 +++--- src/compat/glibc_compat.cpp | 2 +- src/darksend.cpp | 2 +- src/init.cpp | 2 +- src/main.h | 2 +- src/net.cpp | 2 +- src/netbase.h | 2 +- src/qt/addressbookpage.cpp | 2 +- src/qt/bitcoingui.h | 2 +- src/qt/darkcoin.cpp | 2 +- src/qt/notificator.h | 2 +- src/qt/optionsdialog.cpp | 2 +- src/qt/optionsmodel.cpp | 2 +- src/qt/receiverequestdialog.cpp | 2 +- src/qt/test/test_main.cpp | 4 ++-- src/util.h | 2 +- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 6b2e13d0a..8be49ca38 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,8 @@ autom4te.cache/ config.log config.status configure -src/bitcoin-config.h -src/bitcoin-config.h.in +src/darkcoin-config.h +src/darkcoin-config.h.in src/build-aux/ src/stamp-h1 share/setup.nsi diff --git a/configure.ac b/configure.ac index e169a0859..c791a603b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,17 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 11) -define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 25) +define(_CLIENT_VERSION_REVISION, 2) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin]) AC_CONFIG_AUX_DIR([src/build-aux]) AC_CONFIG_MACRO_DIR([src/m4]) AC_CANONICAL_HOST -AH_TOP([#ifndef BITCOIN_CONFIG_H]) -AH_TOP([#define BITCOIN_CONFIG_H]) -AH_BOTTOM([#endif //BITCOIN_CONFIG_H]) +AH_TOP([#ifndef DARKCOIN_CONFIG_H]) +AH_TOP([#define DARKCOIN_CONFIG_H]) +AH_BOTTOM([#endif //DARKCOIN_CONFIG_H]) # This m4 will only be used if a system copy cannot be found. This is helpful # on systems where autotools are installed but the pkg-config macros are not in @@ -111,7 +111,7 @@ AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[spec AC_CONFIG_SRCDIR([src]) -AC_CONFIG_HEADERS([src/bitcoin-config.h]) +AC_CONFIG_HEADERS([src/darkcoin-config.h]) dnl Checks for programs. AC_PROG_CXX @@ -312,7 +312,7 @@ dnl Check for pthread compile/link requirements AX_PTHREAD INCLUDES="$INCLUDES $PTHREAD_CFLAGS" -# The following macro will add the necessary defines to bitcoin-config.h, but +# The following macro will add the necessary defines to darkcoin-config.h, but # they also need to be passed down to any subprojects. Pull the results out of # the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE diff --git a/contrib/darkcoin-qt.pro b/contrib/darkcoin-qt.pro index e85d53209..72de1e422 100644 --- a/contrib/darkcoin-qt.pro +++ b/contrib/darkcoin-qt.pro @@ -7,7 +7,7 @@ HEADERS += \ ../src/allocators.h \ ../src/base58.h \ ../src/bignum.h \ - ../src/bitcoin-config.h \ + ../src/darkcoin-config.h \ ../src/bloom.h \ ../src/chainparams.h \ ../src/checkpoints.h \ diff --git a/contrib/debian/rules b/contrib/debian/rules index 692d28332..ed9f6a0b9 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/darkcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: diff --git a/src/clientversion.h b/src/clientversion.h index f69ba5f19..94ee7361c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -2,7 +2,7 @@ #define CLIENTVERSION_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #else // // client versioning and copyright year @@ -11,8 +11,8 @@ // These need to be macros, as version.cpp's and darkcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 11 -#define CLIENT_VERSION_REVISION 1 -#define CLIENT_VERSION_BUILD 25 +#define CLIENT_VERSION_REVISION 2 +#define CLIENT_VERSION_BUILD 0 diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 5b73e6051..bc1933354 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -1,4 +1,4 @@ -#include "bitcoin-config.h" +#include "darkcoin-config.h" #include #include diff --git a/src/darksend.cpp b/src/darksend.cpp index a41f3d65b..212fbca02 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "darksend.h" diff --git a/src/init.cpp b/src/init.cpp index a6ee27fe9..b25c6d348 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "init.h" diff --git a/src/main.h b/src/main.h index 27bbea817..bac648863 100644 --- a/src/main.h +++ b/src/main.h @@ -8,7 +8,7 @@ #define BITCOIN_MAIN_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "bignum.h" diff --git a/src/net.cpp b/src/net.cpp index 30708fc41..c8c36e0b1 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "net.h" diff --git a/src/netbase.h b/src/netbase.h index c27dd54a1..c18cdc86f 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -6,7 +6,7 @@ #define BITCOIN_NETBASE_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "compat.h" diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 6915415ac..b525d0c3b 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "addressbookpage.h" diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index b01da9af2..ece3427d1 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,7 +6,7 @@ #define BITCOINGUI_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include diff --git a/src/qt/darkcoin.cpp b/src/qt/darkcoin.cpp index e5abe6bbd..0194645ba 100644 --- a/src/qt/darkcoin.cpp +++ b/src/qt/darkcoin.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "bitcoingui.h" diff --git a/src/qt/notificator.h b/src/qt/notificator.h index abab98699..83de7a670 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -6,7 +6,7 @@ #define NOTIFICATOR_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 46e60c372..5ee033921 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "optionsdialog.h" diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index e82b6e884..96276d3b4 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "optionsmodel.h" diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 062638f2b..b6be756e7 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -22,7 +22,7 @@ #endif #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" /* for USE_QRCODE */ +#include "darkcoin-config.h" /* for USE_QRCODE */ #endif #ifdef USE_QRCODE diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a2adb0032..6f42c314c 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,6 +1,6 @@ -#include "bitcoin-config.h" +#include "darkcoin-config.h" #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #ifdef ENABLE_WALLET diff --git a/src/util.h b/src/util.h index 72f1f76a8..c11176911 100644 --- a/src/util.h +++ b/src/util.h @@ -8,7 +8,7 @@ #define BITCOIN_UTIL_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "darkcoin-config.h" #endif #include "compat.h"