From 4397450bd04ad07ccd9c928b31ec18c62b4ba60e Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 24 Sep 2021 16:57:52 +0200 Subject: [PATCH] Revert LD_LIBRARY_PATH= in unrealircd script, as we use -rpath for that. --- configure | 2 -- configure.ac | 1 - unrealircd.in | 1 - 3 files changed, 4 deletions(-) diff --git a/configure b/configure index 8d4ac606e..057715341 100755 --- a/configure +++ b/configure @@ -662,7 +662,6 @@ LDFLAGS_PRIVATELIBS PIDFILE DOCDIR PERMDATADIR -PRIVATELIBDIR TMPDIR CACHEDIR LOGDIR @@ -6590,7 +6589,6 @@ fi - # Check whether --with-maxconnections was given. if test "${with_maxconnections+set}" = set; then : withval=$with_maxconnections; ac_fd=$withval diff --git a/configure.ac b/configure.ac index 09591f358..85d4afefe 100644 --- a/configure.ac +++ b/configure.ac @@ -509,7 +509,6 @@ AC_SUBST(MODULESDIR) AC_SUBST(LOGDIR) AC_SUBST(CACHEDIR) AC_SUBST(TMPDIR) -AC_SUBST(PRIVATELIBDIR) dnl Why o why PERMDATADIR and not DATADIR you ask? dnl well, Because DATADIR conflicts with the Windows SDK header files.. amazing. AC_SUBST(PERMDATADIR) diff --git a/unrealircd.in b/unrealircd.in index 83e1a0a2f..e8d9914ab 100644 --- a/unrealircd.in +++ b/unrealircd.in @@ -17,7 +17,6 @@ if [ "$1" = "start" ] ; then # When built with --with-asan, ASan does not dump core by default because # older gcc/clang might dump a 16TB core file. We explicitly enable it here. export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:log_path=@TMPDIR@/unrealircd_asan:detect_leaks=0" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@PRIVATELIBDIR@" # Check if ~/Unrealxxx/unrealircd.conf exists but the file # ~/unrealircd/conf/unrealircd.conf does not.