trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [trafficserver] branch master updated: Build: Change --enable-example-plugins to control both build and install.
Date Thu, 31 Aug 2017 14:34:36 GMT
This is an automated email from the ASF dual-hosted git repository.

amc 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 17ae9e7  Build: Change --enable-example-plugins to control both build and install.
17ae9e7 is described below

commit 17ae9e7d4fd1819f10584d99e5a0ed069e3c8906
Author: Alan M. Carroll <amc@apache.org>
AuthorDate: Tue Aug 29 19:06:20 2017 -0500

    Build: Change --enable-example-plugins to control both build and install.
---
 configure.ac                                             | 4 ++--
 doc/developer-guide/plugins/example-plugins/index.en.rst | 6 +++++-
 example/Makefile.am                                      | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a564034..169f4a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,13 +498,13 @@ PKG_CHECK_MODULES([LIBMAGICKCPP],[Magick++], [
 AM_CONDITIONAL([BUILD_WEBP_TRANSFORM_PLUGIN], [test "x${enable_webp_transform_plugin}" =
"xyes"])
 
 #
-# Example plugins. The example plugins are always built, but not always installed. Installing
+# Example plugins. The example plugins are only built and installed if this is enabled. Installing
 # them is useful for QA, but not useful for most users, so we default this to disabled.
 #
 
 AC_MSG_CHECKING([whether to install example plugins])
 AC_ARG_ENABLE([example-plugins],
-  [AS_HELP_STRING([--enable-example-plugins],[install example plugins])],
+  [AS_HELP_STRING([--enable-example-plugins],[build and install example plugins])],
   [],
   [enable_example_plugins=no]
 )
diff --git a/doc/developer-guide/plugins/example-plugins/index.en.rst b/doc/developer-guide/plugins/example-plugins/index.en.rst
index 9ab3492..5141eee 100644
--- a/doc/developer-guide/plugins/example-plugins/index.en.rst
+++ b/doc/developer-guide/plugins/example-plugins/index.en.rst
@@ -47,7 +47,11 @@ understand the following topics:
 -  Working with HTTP header functions
 
 The two sample plugins discussed in this chapter are ``blacklist_1.c``
-and ``basic_auth.c``.
+and ``basic_auth.c``. To build and install the example plugins use ::
+
+   ./configure --enable-example-plugins
+
+when :ref:`setting the build configuration <admin-configuration-options>` for |TS|.
 
 Overview
 --------
diff --git a/example/Makefile.am b/example/Makefile.am
index 069c9ea..eab366f 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -23,6 +23,8 @@ AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
 libatscppapi = $(top_builddir)/lib/cppapi/libatscppapi.la
 libtsconfig = $(top_builddir)/lib/tsconfig/libtsconfig.la
 
+if BUILD_EXAMPLE_PLUGINS
+
 example_Plugins = \
 	add_header.la \
 	append_transform.la \
@@ -86,10 +88,8 @@ example_Plugins += \
 	cppapi/boom.la \
 	cppapi/intercept.la
 
-if BUILD_EXAMPLE_PLUGINS
 pkglib_LTLIBRARIES = $(example_Plugins)
-else
-noinst_LTLIBRARIES = $(example_Plugins)
+
 endif
 
 add_header_la_SOURCES = add_header/add_header.c

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message