pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-28 20:46:38 +02:00
Code Activity

Update curl install run path

Browse Source
This commit is contained in:
Travis McArthur
2017-02-26 10:30:42 -08:00
parent 12aa3289b9
commit efdf290bd5
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+4
View File
@@ -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
configure.ac
+4
View File
@@ -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)
extras/curlinstall
+3 -1
View File
@@ -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