[or-cvs] r9827: When checking whether we need extra options to link at runti (tor/trunk)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-03-15 10:18:24 -0400 (Thu, 15 Mar 2007)
New Revision: 9827

Modified:
   tor/trunk/
   tor/trunk/acinclude.m4
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12542] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/acinclude.m4
===================================================================
--- tor/trunk/acinclude.m4	2007-03-15 13:50:23 UTC (rev 9826)
+++ tor/trunk/acinclude.m4	2007-03-15 14:18:24 UTC (rev 9827)
@@ -93,9 +93,13 @@
   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