This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new a74f9e4 Fix yamlcpp include folder by using the YAMLCPP_INCLUDE
variable (#8349)
a74f9e4 is described below
commit a74f9e4cc18d4775096611de32050d30aad9f3f5
Author: Randall Meyer <r...@apache.org>
AuthorDate: Wed Sep 22 17:01:27 2021 -0700
Fix yamlcpp include folder by using the YAMLCPP_INCLUDE variable (#8349)
so if we configure our own version of yamlcpp then the right include files
will be picked up.
This will avoid mixin up the internal and the configured yamlcpp library
(cherry picked from commit 922a47013baf37fadbcc55dbe7b76d163a30020a)
Conflicts:
mgmt/Makefile.am
Co-authored-by: Damian Meden <damian.me...@gmail.com>
---
proxy/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 4eec154..2c73d31 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -39,7 +39,7 @@ AM_CPPFLAGS += \
-I$(abs_srcdir)/hdrs \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/lib/yamlcpp/include \
+ @YAMLCPP_INCLUDES@ \
$(TS_INCLUDES)
noinst_HEADERS = \
