This is an automated email from the ASF dual-hosted git repository.
zwoop 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 99168b123b Install libswoc headers by default, can be disabled instead
(#9893)
99168b123b is described below
commit 99168b123bb2ee3c9847bb60bf1802eeadbe96e1
Author: Leif Hedstrom <[email protected]>
AuthorDate: Wed Jun 21 15:05:29 2023 -0600
Install libswoc headers by default, can be disabled instead (#9893)
---
build/libswoc.m4 | 12 ++++++------
configure.ac | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build/libswoc.m4 b/build/libswoc.m4
index 5ecb9f6037..27c1e1db09 100644
--- a/build/libswoc.m4
+++ b/build/libswoc.m4
@@ -98,13 +98,13 @@ dnl TS_CHECK_SWOC: check if we want to export libswoc
headers from trafficserver
AC_DEFUN([TS_CHECK_SWOC_HEADERS_EXPORT], [
AC_MSG_CHECKING([whether to export libswoc headers])
AC_ARG_ENABLE([swoc-headers],
- [AS_HELP_STRING([--enable-swoc-headers],[Export libswoc headers])],
+ [AS_HELP_STRING([--disable-swoc-headers],[Do not export ATS libswoc
headers])],
+ [],
[
- if test "x$has_libswoc" = "xyes" ; then
- enable_swoc_headers="no - cannot export external headers"
- fi
- ],
- [enable_swoc_headers=no]
+ if test "x$has_libswoc" = "xyes" ; then
+ enable_swoc_headers=no
+ fi
+ ]
)
AC_MSG_RESULT([$enable_swoc_headers])
])
diff --git a/configure.ac b/configure.ac
index 7d5c17394c..9103b7dfb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1473,7 +1473,7 @@ TS_CHECK_LIBSWOC
AM_CONDITIONAL([BUILD_SWOC], [test "$has_libswoc" = "no"])
TS_CHECK_SWOC_HEADERS_EXPORT
-AM_CONDITIONAL([EXPORT_SWOC_HEADERS], [test x"$enable_swoc_headers" = x"yes"])
+AM_CONDITIONAL([EXPORT_SWOC_HEADERS], [test ! x"$enable_swoc_headers" = x"no"])
# Check for optional hiredis library
TS_CHECK_HIREDIS
