Merge branch 'block' of github.com:ethereum/cpp-ethereum into block

CMakeLists.txt

@@ -57,7 +57,7 @@ set(D_PARANOID OFF)
 set(D_PROFILING OFF)
 set(D_ROCKSDB OFF)
 set(D_NOBOOST OFF)
-set(D_FRONTIER ON)
+set(D_OLYMPIC OFF)
 set(D_MINER ON)
 set(D_ETHKEY ON)
 
@@ -188,7 +188,9 @@ function(configureProject)
 		add_definitions(-DNOBOOST)
 	endif()
 
-	if (FRONTIER)
+	if (OLYMPIC)
+		add_definitions(-DETH_OLYMPIC)
+	else()
 		add_definitions(-DETH_FRONTIER)
 	endif()
 
@@ -300,7 +302,7 @@ eth_format_option(TOOLS)
 eth_format_option(ETHKEY)
 eth_format_option(ETHASHCL)
 eth_format_option(JSCONSOLE)
-eth_format_option(FRONTIER)
+eth_format_option(OLYMPIC)
 eth_format_option(SERPENT)
 
 if (JSCONSOLE)
@@ -341,7 +343,7 @@ message("-- FATDB            Full database exploring                  ${FATDB}")
 message("-- JSONRPC          JSON-RPC support                         ${JSONRPC}")
 message("-- USENPM           Javascript source building               ${USENPM}")
 message("-- ROCKSDB          Prefer rocksdb to leveldb                ${ROCKSDB}")
-message("-- FRONTIER         Default to the Frontier network          ${FRONTIER}")
+message("-- OLYMPIC	         Default to the Olympic network           ${OLYMPIC}")
 message("------------------------------------------------------------- components")
 message("-- MINER            Build miner                              ${MINER}")
 message("-- ETHKEY           Build wallet tools                       ${ETHKEY}")