You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2019/11/04 16:40:40 UTC

[trafficserver] branch 9.0.x updated: For remap_stats, removes configure time dependency on search.h

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 57b9c3c  For remap_stats, removes configure time dependency on search.h
57b9c3c is described below

commit 57b9c3c1d4ba70e73a89f4b92de4c6d34d6c6283
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Tue Oct 29 10:50:10 2019 -0700

    For remap_stats, removes configure time dependency on search.h
    
    The plugin no longer depends on this header since moving to C++
    
    (cherry picked from commit 4f569586f9889c91eab3f2f3fcd81bf0cab2549e)
    
     Conflicts:
    	plugins/Makefile.am
---
 configure.ac        | 2 --
 plugins/Makefile.am | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 112afa4..68c3487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2080,8 +2080,6 @@ AS_IF([test "x$enable_experimental_plugins" = "xyes"],
         AC_CHECK_FUNCS([hcreate_r hsearch_r])
       ])
   ])
-AM_CONDITIONAL([BUILD_REMAP_STATS_PLUGIN],
-  [ test "x$enable_experimental_plugins" = "xyes" -a "x$ac_cv_header_search_h" = "xyes" -a "x$ac_cv_type_struct_hsearch_data" = "xyes" -a "x$ac_cv_func_hcreate_r" = "xyes" -a "x$ac_cv_func_hsearch_r" = "xyes" ])
 
 AC_ARG_WITH([default-stack-size],
   [AS_HELP_STRING([--with-default-stack-size],[specify the default stack size in bytes [default=1048576]])],
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9818f9c..5af6494 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -71,6 +71,7 @@ include experimental/memcache/Makefile.inc
 include experimental/metalink/Makefile.inc
 include experimental/money_trace/Makefile.inc
 include experimental/mp4/Makefile.inc
+include experimental/remap_stats/Makefile.inc
 include experimental/server_push_preload/Makefile.inc
 include experimental/slice/Makefile.inc
 include experimental/sslheaders/Makefile.inc
@@ -92,10 +93,6 @@ if BUILD_SSL_SESSION_REUSE_PLUGIN
 include experimental/ssl_session_reuse/Makefile.inc
 endif
 
-if BUILD_REMAP_STATS_PLUGIN
-include experimental/remap_stats/Makefile.inc
-endif
-
 if HAS_KYOTOCABINET
 include experimental/cache_key_genid/Makefile.inc
 endif