@@ -10,6 +10,9 @@ EXTRA_PROGRAMS = CppUTestExtTests
 lib_LIBRARIES = lib/libCppUTest.a
 check_PROGRAMS = $(CPPUTEST_TESTS)
 
+# Change autoconf's hard-coded (and collision susceptible) HAVE_CONFIG_H macro.
+DEFS = $(filter-out -DHAVE_CONFIG_H,@DEFS@) -DCPPUTEST_HAVE_GENERATED_CONFIG_H
+
 if INCLUDE_CPPUTEST_EXT
 lib_LIBRARIES+= lib/libCppUTestExt.a
 check_PROGRAMS += $(CPPUTESTEXT_TESTS)
 
@@ -41,7 +41,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
+#ifdef CPPUTEST_HAVE_GENERATED_CONFIG_H
 #include "generated/CppUTestGeneratedConfig.h"
 #endif
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`*`
`42`	`42`	`*/`
`43`	`43`
`44`		`-#ifdef HAVE_CONFIG_H`
	`44`	`+#ifdef CPPUTEST_HAVE_GENERATED_CONFIG_H`
`45`	`45`	`#include "generated/CppUTestGeneratedConfig.h"`
`46`	`46`	`#endif`
`47`	`47`