[tor-commits] [torsocks/master] Fix: bad libc detection on system with libcap.so

[dgoulet at torproject.org]

commit 2812e211f4827eef110a31baeef6241a5a0e8e89
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Fri Feb 7 22:20:38 2014 -0500

    Fix: bad libc detection on system with libcap.so
    
    The binary "yes" is much more generic and has a standard path in BSD,
    Linux and OS X. Furthermore, it cannot be linked with libcap.so. But
    this patch improves the grep regex to only detect "libc.so".
    
    Fixes #21
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3cfda8f..a3cadf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AS_CASE([$host_os],
 	[darwin*], [libc_name="libSystem.dylib"],
 	[linux*],
 	[
-		libc_name=`ldd /bin/ls | grep libc | cut -d ' ' -f 1 | tr -d '\t'`
+		libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 1 | tr -d '\t'`
 		if test "${libc_name}" == ""; then
 			# Default libc on most system.
 			libc_name="libc.so.6"