Add the c++ definition HAVE_CONFIG_H in the scons build and check it before including config.h so the cmake build system doesn't need to worry about conflicts from that file if it exists.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6342 8ced0084-cf51-0410-be5f-012b33b47a6e

Externals/WiiUse/Src/wiiuse.h

@@ -48,7 +48,9 @@
 	#include <IOBluetooth/IOBluetoothUserLib.h>
 	#include <string.h>
 #elif defined(__linux__)
-	#include "config.h"
+	#ifdef HAVE_CONFIG_H
+		#include "config.h"
+	#endif
 	#if HAVE_BLUEZ
 	#include <bluetooth/bluetooth.h>
 	#endif

SConstruct

@@ -94,7 +94,7 @@ if env['CCVERSION'] < '4.2.0':
 if env['CCVERSION'] >= '4.3.0':
     env['CCFLAGS'] += ['-Wno-array-bounds', '-Wno-unused-result']
 
-env['CPPDEFINES'] = []
+env['CPPDEFINES'] = ['HAVE_CONFIG_H']
 if env['flavor'] == 'debug':
     env['CPPDEFINES'] += ['_DEBUG']
 elif env['flavor'] == 'fastlog':

Source/Core/Common/Src/Common.h

@@ -108,7 +108,7 @@ extern const char *netplay_dolphin_ver;
 		//CrtDebugBreak breakAt(614);
 	#endif // end DEBUG/FAST
 
-#else
+#elif defined HAVE_CONFIG_H
 #include "config.h"	// SCons autoconfiguration defines
 #endif