From efdf290bd5591cb0cac7bf112b73fdd6efbdb0bd Mon Sep 17 00:00:00 2001
From: Travis McArthur <travis@sectionfive.net>
Date: Sun, 26 Feb 2017 10:30:42 -0800
Subject: [PATCH] Update curl install run path

---
 configure          | 4 ++++
 configure.ac       | 4 ++++
 extras/curlinstall | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index aba1d5c4c..27c1cf774 100755
--- a/configure
+++ b/configure
@@ -6971,6 +6971,8 @@ _ACEOF
 
 		PRIVATELIBDIR="$withval"
 		LD_RUN_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		LD_LIBRARY_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		export LD_LIBRARY_PATH
 		export LD_RUN_PATH
 else
 
@@ -6980,6 +6982,8 @@ _ACEOF
 
 		PRIVATELIBDIR="$HOME/unrealircd/lib"
 		LD_RUN_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		LD_LIBRARY_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		export LD_LIBRARY_PATH
 		export LD_RUN_PATH
 fi
 
diff --git a/configure.ac b/configure.ac
index c6570be1f..05eba2f93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -590,10 +590,14 @@ AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify
 	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$withval"], [Define the location of private libraries])
 		PRIVATELIBDIR="$withval"
 		LD_RUN_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		LD_LIBRARY_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		export LD_LIBRARY_PATH
 		export LD_RUN_PATH],
 	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$HOME/unrealircd/lib"], [Define the location of private libraries])
 		PRIVATELIBDIR="$HOME/unrealircd/lib"
 		LD_RUN_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		LD_LIBRARY_PATH="$LD_RUN_PATH $PRIVATELIBDIR"
+		export LD_LIBRARY_PATH
 		export LD_RUN_PATH])
 
 AC_SUBST(BINDIR)
diff --git a/extras/curlinstall b/extras/curlinstall
index 16385fa4b..076ea059a 100755
--- a/extras/curlinstall
+++ b/extras/curlinstall
@@ -6,6 +6,8 @@ ARESPATH="`pwd`/extras/c-ares"
 UNREALDIR="`pwd`"
 CARESVERSION="1.12.0"
 LIBDIR="$1"
+LD_RUN_PATH="$LD_RUN_PATH $LIBDIR"
+export LD_RUN_PATH
 
 if [ "x$1" = "x" ]; then
 	echo "You should (no longer) run this program directly."
@@ -90,7 +92,7 @@ cd "$OUTD" || exit 1
 
 echo "Building and installing libcurl"
 CPPFLAGS="-I$ARESPATH/include" ./configure --prefix=$UNREALDIR/extras/curl --libdir=$LIBDIR --enable-shared \
- --disable-thread --enable-ares=$ARESPATH --disable-ipv6
+ --disable-thread --enable-ares=$LIBDIR --disable-ipv6
 cp -R $ARESPATH/lib ares
 make && make install