diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-15 14:18:24 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-15 14:18:24 +0000 |
| commit | 136c0f5431cca5bbea74277238ff9223f5b7831d (patch) | |
| tree | 3fd8b4cff6692710b35fb8ee29d60d402bdcf3f0 /acinclude.m4 | |
| parent | 2ad403129de2b2f28a1c1aa5d63c53f4176a5b70 (diff) | |
| download | tor-136c0f5431cca5bbea74277238ff9223f5b7831d.tar tor-136c0f5431cca5bbea74277238ff9223f5b7831d.tar.gz | |
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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 31814c029..cef577ec5 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 |