This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 727d330e80 Remove header files generated by autotools automatically 
(#11063)
727d330e80 is described below

commit 727d330e809e741968c53a59e8c0cbaf2a5672a5
Author: Masakazu Kitajo <[email protected]>
AuthorDate: Fri Feb 9 16:18:06 2024 -0700

    Remove header files generated by autotools automatically (#11063)
---
 CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1df645499d..ac0072d493 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -571,6 +571,16 @@ endif()
 
 set(rel_cachedir var/trafficserver)
 
+if(EXISTS "${PROJECT_SOURCE_DIR}/include/ink_autoconf.h")
+  message(STATUS "Autoconf build detected in source tree. Removing autoconf 
headers.")
+endif()
+
+# In-tree autoconf configuration causes duplicate definitions of some symbols
+# in generated headers. If the files don't exist, no error is emitted.
+file(REMOVE "${PROJECT_SOURCE_DIR}/include/tscore/ink_config.h")
+file(REMOVE "${PROJECT_SOURCE_DIR}/include/ts/apidefs.h")
+file(REMOVE "${PROJECT_SOURCE_DIR}/include/ink_autoconf.h")
+
 configure_file(configs/storage.config.default.in 
configs/storage.config.default)
 configure_file(configs/records.yaml.default.in configs/records.yaml.default)
 configure_file(include/tscore/ink_config.h.cmake.in 
include/tscore/ink_config.h)

Reply via email to