Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 88 deletions

diff --git a/m4/jemalloc.m4 b/m4/jemalloc.m4
deleted file mode 100644
index bb5dceb81..000000000
--- a/m4/jemalloc.m4
+++ /dev/null
@@ -1,88 +0,0 @@
-dnl -------------------------------------------------------- -*- autoconf -*-
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements.  See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License.  You may obtain a copy of the License at
-dnl
-dnl     http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
-
-dnl
-dnl jemalloc.m4: Trafficserver's jemalloc autoconf macros
-dnl modified to skip other TS_ helpers
-dnl
-
-AC_DEFUN([TS_CHECK_JEMALLOC], [
-AC_ARG_WITH([jemalloc-prefix],
-  [AS_HELP_STRING([--with-jemalloc-prefix=PREFIX],[Specify the jemalloc prefix [default=""]])],
-  [
-  jemalloc_prefix="$withval"
-  ],[
-  if test "`uname -s`" = "Darwin"; then
-    jemalloc_prefix="je_"
-  else
-    jemalloc_prefix=""
-  fi
-  ]
-)
-AC_DEFINE_UNQUOTED([prefix_jemalloc], [${jemalloc_prefix}], [jemalloc prefix])
-
-enable_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
-      AC_MSG_ERROR([Cannot compile with both jemalloc and tcmalloc])
-    fi
-    enable_jemalloc=yes
-    jemalloc_base_dir="$withval"
-    case "$withval" in
-      yes)
-        jemalloc_base_dir="/usr"
-        AC_MSG_CHECKING(checking for jemalloc includes standard directories)
-	;;
-      *":"*)
-        jemalloc_include="`echo $withval |sed -e 's/:.*$//'`"
-        jemalloc_ldflags="`echo $withval |sed -e 's/^.*://'`"
-        AC_MSG_CHECKING(checking for jemalloc includes in $jemalloc_include libs in $jemalloc_ldflags)
-        ;;
-      *)
-        jemalloc_include="$withval/include"
-        jemalloc_ldflags="$withval/lib"
-        AC_MSG_CHECKING(checking for jemalloc includes in $withval)
-        ;;
-    esac
-  fi
-])
-
-has_jemalloc=0
-if test "$enable_jemalloc" != "no"; then
-  jemalloc_have_headers=0
-  jemalloc_have_libs=0
-  if test "$jemalloc_base_dir" != "/usr"; then
-    CFLAGS="${CFLAGS} -I${jemalloc_include}"
-    LDFLAGS="${LDFLAGS} -L${jemalloc_ldflags}"
-    LIBTOOL_LINK_FLAGS="${LIBTOOL_LINK_FLAGS} -R${jemalloc_ldflags}"
-  fi
-  func="${jemalloc_prefix}malloc_stats_print"
-  AC_CHECK_LIB(jemalloc, ${func}, [jemalloc_have_libs=1])
-  if test "$jemalloc_have_libs" != "0"; then
-    AC_CHECK_HEADERS([jemalloc/jemalloc.h], [jemalloc_have_headers=1])
-  fi
-  if test "$jemalloc_have_headers" != "0"; then
-    has_jemalloc=1
-    LIBS="${LIBS} -ljemalloc"
-    AC_DEFINE(has_jemalloc, [1], [Link/compile against jemalloc])
-  else
-    AC_MSG_ERROR([Couldn't find a jemalloc installation])
-  fi
-fi
-AC_SUBST(has_jemalloc)
-])