[tor-commits] [torsocks/pending-changes] Update lib dir check

ioerror at torproject.org ioerror at torproject.org
Wed Nov 7 04:18:20 UTC 2012


commit 1699610ecc6fd64f85c6fa3cee56d24ba2010d87
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Mon Nov 5 16:29:52 2012 -0500

    Update lib dir check
    
    Address issue 33 where /usr/lib64 is the proper lib dir
    but /usr/lib is still set in torsocks.in
---
 src/torsocks.in |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/torsocks.in b/src/torsocks.in
index 53db2fc..606d3d4 100755
--- a/src/torsocks.in
+++ b/src/torsocks.in
@@ -78,6 +78,12 @@ LIB_NAME="libtorsocks"
 SHLIB_EXT="@SHLIB_EXT@"
 SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}"
 
+# Check for libtorsocks and if set the 64bit variant
+if [ ! -f $SHLIB ]; then
+   LIBDIR="@prefix@/lib64/torsocks"
+   SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}"
+fi
+
 # Ensure libtorsocks exists,
 if [ ! -f $SHLIB ]; then
    echo "$0: $SHLIB does not exist! Try re-installing torsocks."





More information about the tor-commits mailing list