renamed cryptopp/config.h to settings.h

jaromil · jaromil · commit 9141f2c2d8de · 2011-04-16T15:09:11.000+02:00
naming an header config.h besides the one generated in the root dir by autoconf is a very bad idea(tm)
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 config.guess
+config.h
 config.h.in
 config.log
 config.status
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -6,7 +6,8 @@ bin_PROGRAMS = bitcoind
 bitcoind_SOURCES = util.cpp script.cpp db.cpp net.cpp irc.cpp \
 			main.cpp rpc.cpp init.cpp
 bitcoind_CXXFLAGS = -O2 -Wno-invalid-offsetof -Wformat -I$(DB_CXX_HEADER_PREFIX)
-bitcoind_CPPFLAGS = $(BOOST_CPPFLAGS) $(SSL_CPPFLAGS) $(CRYPTO_CPPFLAGS) $(GTHREAD2_CPPFLAGS)
+bitcoind_CPPFLAGS = -Icryptopp \
+	$(BOOST_CPPFLAGS) $(SSL_CPPFLAGS) $(CRYPTO_CPPFLAGS) $(GTHREAD2_CPPFLAGS)
 bitcoind_LDADD = cryptopp/libcryptopp.la \
    $(COMMON_LIBS) \
    $(BOOST_LIBS) \
diff --git a/src/cryptopp/Makefile.am b/src/cryptopp/Makefile.am
@@ -3,5 +3,5 @@ noinst_LTLIBRARIES = libcryptopp.la
 
 libcryptopp_la_SOURCES = sha.cpp cpu.cpp
 
-noinst_HEADERS = config.h cpu.h cryptlib.h iterhash.h misc.h \
+noinst_HEADERS = settings.h cpu.h cryptlib.h iterhash.h misc.h \
 	  pch.h secblock.h sha.h simple.h smartptr.h stdcpp.h
diff --git a/src/cryptopp/cpu.h b/src/cryptopp/cpu.h
@@ -10,7 +10,7 @@
 
 #else
 
-#include "config.h"
+#include <settings.h>
 
 #ifdef CRYPTOPP_MSVC6PP_OR_LATER
 	#include <emmintrin.h>
diff --git a/src/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h
@@ -79,7 +79,7 @@ and getting me started with this manual.
 #ifndef CRYPTOPP_CRYPTLIB_H
 #define CRYPTOPP_CRYPTLIB_H
 
-#include "config.h"
+#include <settings.h>
 #include "stdcpp.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/src/cryptopp/pch.h b/src/cryptopp/pch.h
@@ -7,7 +7,7 @@
 
 #else
 
-	#include "config.h"
+	#include <settings.h>
 
 	#ifdef USE_PRECOMPILED_HEADERS
 		#include "simple.h"
diff --git a/src/cryptopp/secblock.h b/src/cryptopp/secblock.h
@@ -3,7 +3,7 @@
 #ifndef CRYPTOPP_SECBLOCK_H
 #define CRYPTOPP_SECBLOCK_H
 
-#include "config.h"
+#include <settings.h>
 #include "misc.h"
 #include <assert.h>
 
diff --git a/src/cryptopp/settings.h b/src/cryptopp/settings.h
diff --git a/src/cryptopp/smartptr.h b/src/cryptopp/smartptr.h
@@ -1,7 +1,7 @@
 #ifndef CRYPTOPP_SMARTPTR_H
 #define CRYPTOPP_SMARTPTR_H
 
-#include "config.h"
+#include <settings.h>
 #include <algorithm>
 
 NAMESPACE_BEGIN(CryptoPP)
