[tor-commits] [torbrowser/maint-2.2] update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug

[erinn at torproject.org]

commit c66ed4c55395fe9f5e9e173a02854051c9bad6a3
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Mar 23 22:01:04 2011 +0100

    update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug
---
 build-scripts/linux.mk           |    6 +++---
 src/RelativeLink/RelativeLink.sh |    5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 463d972..f2dade8 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -332,9 +332,9 @@ install-binaries:
 	# zlib
 	cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)/libz
 	# Libevent
-	cp -d $(LIBEVENT)/libevent-1.4.so.2 $(LIBEVENT)/libevent-1.4.so.2.1.3 $(LIBEVENT)/libevent_core.so \
-           $(LIBEVENT)/libevent_core-1.4.so.2 $(LIBEVENT)/libevent_core-1.4.so.2.1.3 \
-           $(LIBEVENT)/libevent_extra-1.4.so.2 $(LIBEVENT)/libevent_extra-1.4.so.2.1.3 \
+	cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \
+           $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \
+           $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \
            $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR)
 	# libpng
 	cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) 
diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh
index 5b83305..c5b7b28 100755
--- a/src/RelativeLink/RelativeLink.sh
+++ b/src/RelativeLink/RelativeLink.sh
@@ -14,6 +14,11 @@ if [ $1 ]; then
 	printf "\nDebug enabled.\n\n"
 fi
 
+if [ -z $XAUTHORITY]; then 
+	XAUTHORITY=~/.Xauthority
+	export XAUTHORITY
+fi
+
 # Try to be agnostic to where we're being started from, chdir to where
 # the script is.
 mydir="$(dirname $0)"