From 136c0f5431cca5bbea74277238ff9223f5b7831d Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Mar 2007 14:18:24 +0000
Subject: [PATCH]  r12542@Kushana:  nickm | 2007-03-15 10:17:50 -0400  When
 checking whether we need extra options to link at runtime against a library,
 be sure to actually look in the lib directory.

svn:r9827
---
 acinclude.m4 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 31814c0297..cef577ec5f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -93,9 +93,13 @@ if test -z "$CROSS_COMPILE"; then
   AC_CACHE_CHECK([whether we need extra options to link $1],
                  tor_cv_library_$1_linker_option, [
    tor_saved_LDFLAGS="$LDFLAGS"
-   tor_trydir="$tor_cv_library_$1_dir"
    runs=no
    linked_with=nothing
+   if test -d "$tor_cv_library_$1_dir/lib"; then
+     tor_trydir="$tor_cv_library_$1_dir/lib"
+   else
+     tor_trydir="$tor_cv_library_$1_dir"
+   fi
    for tor_tryextra in "(none)" "-Wl,-R$tor_trydir" "-R$tor_trydir" \
                        "-Wl,-rpath,$tor_trydir" ; do
      if test "$tor_tryextra" = "(none)"; then