From 08fc3b2d5173512a2c1fdbe11cf00c8c70bad503 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Mon, 12 Mar 2012 15:07:53 -0700
Subject: [PATCH] Fix --with-mangling/--with-jemalloc-prefix interaction.

Fix --with-mangling to remove mangled symbols from the set of functions
to apply a prefix to.  Prior to this change, the interaction was correct
with autoconf 2.59, but incorrect with autoconf 2.65.
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5a11588f..5cf2855f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,9 +346,12 @@ AC_ARG_WITH([mangling],
   [AS_HELP_STRING([--with-mangling=<map>], [Mangle symbols in <map>])],
   [mangling_map="$with_mangling"], [mangling_map=""])
 for nm in `echo ${mangling_map} |tr ',' ' '` ; do
-  n="je_`echo ${nm} |tr ':' ' ' |awk '{print $1}'`"
+  k="`echo ${nm} |tr ':' ' ' |awk '{print $1}'`"
+  n="je_${k}"
   m=`echo ${nm} |tr ':' ' ' |awk '{print $2}'`
   AC_DEFINE_UNQUOTED([${n}], [${m}])
+  dnl Remove key from public_syms so that it isn't redefined later.
+  public_syms=`for sym in ${public_syms}; do echo "${sym}"; done |grep -v "^${k}\$" |tr '\n' ' '`
 done
 
 dnl Do not prefix public APIs by default.