[2/3] git commit: TS-2112: make libloader compile by default

[zw...@apache.org]

TS-2112: make libloader compile by default

libloader has been considered as stable since it's donation, but it
wasn't put into the build by default.

We change this now, and we add a convention for how to add plugins in
the future.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e6817d9a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e6817d9a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e6817d9a

Branch: refs/heads/3.4.x
Commit: e6817d9ac3b7c319787048d9078373ba23a67c24
Parents: 35d6c79
Author: Igor Galić <i....@brainsware.org>
Authored: Thu Aug 8 19:36:35 2013 +0200
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Aug 11 12:48:50 2013 -0600

----------------------------------------------------------------------
 CHANGES                       |  3 +++
 configure.ac                  |  1 +
 plugins/Makefile.am           | 13 ++++++++++++-
 plugins/libloader/Makefile.am | 21 +++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 52ce1dc..f3bb775 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache Traffic Server 3.4.0
 
   *) [TS-2129] Check for existence of ExtUtils::MakeMaker.
 
+  *) [TS-2112] Make libloader compile by default.
+
+
 Changes with Apache Traffic Server 3.3.5
 
   *) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 616294c..f726ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1859,6 +1859,7 @@ AC_CONFIG_FILES([
   plugins/experimental/tcp_info/Makefile
   plugins/experimental/healthchecks/Makefile
   plugins/gzip/Makefile
+  plugins/libloader/Makefile
   plugins/header_filter/Makefile
   plugins/header_rewrite/Makefile
   plugins/regex_remap/Makefile

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/plugins/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index abfbaac..819af67 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,4 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = conf_remap regex_remap header_filter stats_over_http experimental cacheurl header_rewrite gzip
+# Add new plugins in alphabetic order, but keep experimental always at the bottom.
+
+SUBDIRS = \
+  cacheurl \
+  conf_remap \
+  gzip \
+  header_filter \
+  header_rewrite \
+  libloader \
+  regex_remap \
+  stats_over_http \
+  experimental

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6817d9a/plugins/libloader/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/libloader/Makefile.am b/plugins/libloader/Makefile.am
new file mode 100644
index 0000000..1a91a0f
--- /dev/null
+++ b/plugins/libloader/Makefile.am
@@ -0,0 +1,21 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+include $(top_srcdir)/build/plugins.mk
+
+pkglib_LTLIBRARIES = libloader.la
+libloader_la_SOURCES = libloader.c
+libloader_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)