From 185963ef3a51b518896d49d9f564d9eb7b6fe925 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 6 Jul 2018 12:48:58 -0400
Subject: [PATCH] Ticket 49832 - remove tcmalloc references

Description:  We now bundle jemalloc, so stop building the server
              with tcmalloc.

https://pagure.io/389-ds-base/issue/49832

Reviewed by: mreynolds(one line commit rule)
---
 Makefile.am    |  4 +---
 configure.ac   |  2 --
 m4/tcmalloc.m4 | 46 ----------------------------------------------
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 m4/tcmalloc.m4

diff --git a/Makefile.am b/Makefile.am
index 2ba98bdb7..16e3f58b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,6 @@ PCRE_LINK = @pcre_lib@ -lpcre
 NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
 PAM_LINK = -lpam
 KERBEROS_LINK = $(kerberos_lib)
-TCMALLOC_LINK = @tcmalloc_lib@
 EVENT_LINK = @event_lib@
 
 LIBSOCKET=@LIBSOCKET@
@@ -193,8 +192,7 @@ if HPUX
 AM_LDFLAGS = -lpthread
 else
 #AM_LDFLAGS = -Wl,-z,defs
-# Provide the tcmalloc links if needed
-AM_LDFLAGS = $(RUST_LDFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSAN_CFLAGS) $(UBSAN_CFLAGS) $(PROFILING_LINKS) $(TCMALLOC_LINK) $(CLANG_LDFLAGS)
+AM_LDFLAGS = $(RUST_LDFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSAN_CFLAGS) $(UBSAN_CFLAGS) $(PROFILING_LINKS) $(CLANG_LDFLAGS)
 endif #end hpux
 
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
diff --git a/configure.ac b/configure.ac
index 78a7a422f..c994e88f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,7 +652,6 @@ case $host in
     platform="linux"
     initdir='$(sysconfdir)/rc.d/init.d'
     # do arch specific linux stuff here
-    # TCMalloc is only on i686, x86_64, ppc64 and arm, so we pick that here.
     case $host in
       i*86-*-linux*)
         AC_DEFINE([CPU_x86], [], [cpu type x86])
@@ -849,7 +848,6 @@ m4_include(m4/selinux.m4)
 m4_include(m4/systemd.m4)
 m4_include(m4/cmocka.m4)
 m4_include(m4/doxygen.m4)
-m4_include(m4/tcmalloc.m4)
 
 PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
 AC_SUBST(PACKAGE_BASE_VERSION)
diff --git a/m4/tcmalloc.m4 b/m4/tcmalloc.m4
deleted file mode 100644
index af8ac0a9e..000000000
--- a/m4/tcmalloc.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2017 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details. 
-# END COPYRIGHT BLOCK
-
-AC_CHECKING(for --enable-tcmalloc)
-
-AC_ARG_ENABLE(tcmalloc, AS_HELP_STRING([--enable-tcmalloc], [Enable tcmalloc based tests (default: no)]),
-[
-    AC_MSG_RESULT(yes)
-    AC_DEFINE([WITH_TCMALLOC], [1], [With tcmalloc])
-    with_tcmalloc="yes"
-
-    if test "$enable_asan" = "yes" ; then
-        AC_MSG_ERROR([CRITICAL: You may not enable ASAN and TCMALLOC simultaneously])
-    fi
-
-    case $host in
-      s390-*-linux*)
-        AC_MSG_ERROR([tcmalloc not support on s390])
-        ;;
-      *)
-        AC_MSG_CHECKING(for tcmalloc)
-        if $PKG_CONFIG --exists libtcmalloc; then
-            tcmalloc_inc=`$PKG_CONFIG --cflags libtcmalloc`
-            tcmalloc_lib=`$PKG_CONFIG --libs libtcmalloc`
-            AC_MSG_RESULT([using system tcmalloc])
-        else
-            AC_MSG_ERROR([pkg-config could not find tcmalloc!])
-        fi
-    esac
-
-],
-[
-    AC_MSG_RESULT(no)
-    with_tcmalloc="0"
-])
-
-AM_CONDITIONAL([WITH_TCMALLOC], [test "$with_tcmalloc" = "yes"])
-AC_SUBST(tcmalloc_inc)
-AC_SUBST(tcmalloc_lib)
-
-
-- 
2.17.1