Skip to content

Adds support for configure option --enable-yaml-headers #6519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Mar 18, 2020
Merged

Adds support for configure option --enable-yaml-headers #6519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions build/yaml-cpp.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,14 @@ AC_SUBST([YAMLCPP_LIBS])
AC_SUBST([YAMLCPP_LDFLAGS])

])

dnl TS_CHECK_YAML_HEADERS_EXPORT: check if we want to export yaml-cpp headers from trafficserver. default: not exported
AC_DEFUN([TS_CHECK_YAML_HEADERS_EXPORT], [
AC_MSG_CHECKING([whether to export yaml-cpp headers])
AC_ARG_ENABLE([yaml-headers],
[AS_HELP_STRING([--enable-yaml-headers],[Export yaml-cpp headers])],
[],
[enable_yaml_headers=no]
)
AC_MSG_RESULT([$enable_yaml_headers])
])
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,9 @@ AC_SUBST([LIBJANSSON])
TS_CHECK_YAML_CPP
AM_CONDITIONAL([BUILD_YAML_CPP], [test x"$has_yaml_cpp" = x"no"])

TS_CHECK_YAML_HEADERS_EXPORT
AM_CONDITIONAL([EXPORT_YAML_HEADERS], [test x"$enable_yaml_headers" = x"yes"])

# Check for optional hiredis library
TS_CHECK_HIREDIS

Expand Down
2 changes: 2 additions & 0 deletions lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,7 @@ all-local: $(LOCAL)
clean-local:
$(MAKE) -C yamlcpp clean

if EXPORT_YAML_HEADERS
install-data-local:
$(MAKE) -C yamlcpp install
endif