Merge pull request #1872 from thetic/dont_have_config_h

basvodde · web-flow · commit b6d49e484696 · 2026-01-05T21:32:46.000+01:00
Rename HAVE_CONFIG_H
diff --git a/Makefile.am b/Makefile.am
@@ -10,6 +10,13 @@ EXTRA_PROGRAMS = CppUTestExtTests
 lib_LIBRARIES = lib/libCppUTest.a
 check_PROGRAMS = $(CPPUTEST_TESTS)
 
+# HACK: Replace the HAVE_CONFIG_H macro with CPPUTEST_HAVE_GENERATED_CONFIG_H.
+# The name HAVE_CONFIG_H is a hard-coded in autoconf and cannot be changed in
+# any "normal" ways. This isn't typically a problem, but CppUTest exposes the
+# macro in its public headers. This leads to collisions with any other projects
+# built with autoconf.
+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)
diff --git a/include/CppUTest/CppUTestGeneratedConfig.h b/include/CppUTest/CppUTestGeneratedConfig.h
@@ -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`