[trafficserver] branch 9.2.x updated: fix wording (#8491)

[zw...@apache.org]

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

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


The following commit(s) were added to refs/heads/9.2.x by this push:
     new e84f5d5  fix wording (#8491)
e84f5d5 is described below

commit e84f5d535127c693fbf973914047611f01f4807e
Author: Fei Deng <du...@gmail.com>
AuthorDate: Wed Nov 3 10:17:12 2021 -0500

    fix wording (#8491)
    
    (cherry picked from commit 174dfaaab95f0f0e4cbee7b212ac3974a9631a41)
---
 build/jemalloc.m4 | 23 +++++++++++------------
 build/tcmalloc.m4 |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build/jemalloc.m4 b/build/jemalloc.m4
index 9f2c0d1..8306a83 100644
--- a/build/jemalloc.m4
+++ b/build/jemalloc.m4
@@ -19,14 +19,14 @@ dnl jemalloc.m4: Trafficserver's jemalloc autoconf macros
 dnl
 
 AC_DEFUN([TS_CHECK_JEMALLOC], [
-enable_jemalloc=no
+has_jemalloc=no
 AC_ARG_WITH([jemalloc], [AS_HELP_STRING([--with-jemalloc=DIR],[use a specific jemalloc library])],
 [
   if test "$withval" != "no"; then
-    if test "x${enable_tcmalloc}" = "xyes"; then
+    if test "x${has_tcmalloc}" = "xyes"; then
       AC_MSG_ERROR([Cannot compile with both jemalloc and tcmalloc])
     fi
-    enable_jemalloc=yes
+    has_jemalloc=yes
     jemalloc_base_dir="$withval"
     case "$withval" in
       yes)
@@ -46,13 +46,12 @@ AC_ARG_WITH([jemalloc], [AS_HELP_STRING([--with-jemalloc=DIR],[use a specific je
     esac
   fi
 ])
-
 jemalloch=0
-if test "$enable_jemalloc" != "no"; then
+if test "$has_jemalloc" != "no"; then
   saved_ldflags=$LDFLAGS
   saved_cppflags=$CPPFLAGS
-  jemalloc_have_headers=0
-  jemalloc_have_libs=0
+  jemalloc_has_headers=0
+  jemalloc_has_libs=0
   if test "$jemalloc_base_dir" != "/usr"; then
     TS_ADDTO(CPPFLAGS, [-I${jemalloc_include}])
     TS_ADDTO(LDFLAGS, [-L${jemalloc_ldflags} -Wl,-rpath,${jemalloc_ldflags}])
@@ -60,13 +59,13 @@ if test "$enable_jemalloc" != "no"; then
   fi
   # On Darwin, jemalloc symbols are prefixed with je_. Search for that first, then fall back
   # to unadorned symbols.
-  AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [jemalloc_have_libs=1],
-    [AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [jemalloc_have_libs=1])]
+  AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [jemalloc_has_libs=1],
+    [AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [jemalloc_has_libs=1])]
   )
-  if test "$jemalloc_have_libs" != "0"; then
-    AC_CHECK_HEADERS(jemalloc/jemalloc.h, [jemalloc_have_headers=1])
+  if test "$jemalloc_has_libs" != "0"; then
+    AC_CHECK_HEADERS(jemalloc/jemalloc.h, [jemalloc_has_headers=1])
   fi
-  if test "$jemalloc_have_headers" != "0"; then
+  if test "$jemalloc_has_headers" != "0"; then
     AC_RUN_IFELSE([
       AC_LANG_PROGRAM(
         [#include <jemalloc/jemalloc.h>],
diff --git a/build/tcmalloc.m4 b/build/tcmalloc.m4
index 64a8ed3..fe9d538 100644
--- a/build/tcmalloc.m4
+++ b/build/tcmalloc.m4
@@ -34,7 +34,7 @@ has_tcmalloc=0
 AC_ARG_WITH([tcmalloc], [AS_HELP_STRING([--with-tcmalloc=DIR],[use the tcmalloc library])],
 [
   if test "$withval" != "no"; then
-    if test "x${enable_jemalloc}" = "xyes"; then
+    if test "x${has_jemalloc}" = "xyes"; then
       AC_MSG_ERROR([Cannot compile with both tcmalloc and jemalloc])
     fi
     tcmalloc_have_libs=0