auxpow fixes

src/Makefile.am

@@ -28,6 +28,7 @@ BITCOIN_CORE_H = \
   addrman.h \
   alert.h \
   allocators.h \
+  auxpow.h \
   base58.h bignum.h \
   bloom.h \
   chainparams.h \
@@ -108,6 +109,7 @@ version.o: obj/build.h
 libbitcoin_server_a_SOURCES = \
   addrman.cpp \
   alert.cpp \
+  auxpow.cpp \
   bloom.cpp \
   checkpoints.cpp \
   coins.cpp \

src/main.cpp

@@ -1533,7 +1533,7 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits, int algo)
 bool CBlockHeader::CheckProofOfWork(int nHeight) const
 {
 	int algo = GetAlgo();
-    if ((nHeight >= GetAuxPowStartBlock()) && (algo == ALGO_SHA256D && algo == ALGO_SCRYPT))
+    if ((nHeight >= GetAuxPowStartBlock()) && (algo == ALGO_SHA256D || algo == ALGO_SCRYPT))
     {
         // Prevent same work from being submitted twice:
         // - this block must have our chain ID