From a4936ce4d635ef129be201f53cdc0786315ac3b6 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Mon, 23 Apr 2012 12:46:46 -0700
Subject: [PATCH] Fix jemalloc.sh code generation.

Fix jemalloc.sh code generation by adding @sorev@ and using it instead
of @SOREV@ (which contains Makefile-specific variables).
---
 bin/jemalloc.sh.in | 2 +-
 configure.ac       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/jemalloc.sh.in b/bin/jemalloc.sh.in
index cdf36737..58683f5d 100644
--- a/bin/jemalloc.sh.in
+++ b/bin/jemalloc.sh.in
@@ -4,6 +4,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@SOREV@
+@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@sorev@
 export @LD_PRELOAD_VAR@
 exec "$@"
diff --git a/configure.ac b/configure.ac
index 396b5ef3..73389905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,7 @@ libprefix="lib"
 DSO_LDFLAGS='-shared -Wl,-soname,$(@F)'
 RPATH='-Wl,-rpath,$(1)'
 SOREV='$(SO).$(REV)'
+sorev="${so}.${rev}"
 PIC_CFLAGS='-fPIC -DPIC'
 
 dnl Heap profiling uses the log(3) function.
@@ -226,6 +227,7 @@ case "${host}" in
 	force_tls="0"
 	DSO_LDFLAGS='-shared -Wl,-dylib_install_name,$(@F)'
 	SOREV='$(REV).$(SO)'
+	sorev="${rev}.${so}"
 	;;
   *-*-freebsd*)
 	CFLAGS="$CFLAGS"
@@ -284,6 +286,7 @@ case "${host}" in
 	libprefix=""
 	exe=".exe"
 	SOREV='$(SO)'
+	sorev="${so}"
 	PIC_CFLAGS=""
 	;;
   *)
@@ -301,6 +304,7 @@ AC_SUBST([exe])
 AC_SUBST([libprefix])
 AC_SUBST([DSO_LDFLAGS])
 AC_SUBST([SOREV])
+AC_SUBST([sorev])
 AC_SUBST([PIC_CFLAGS])
 
 JE_COMPILABLE([__attribute__ syntax],