[or-cvs] r10349: Oops. we actually _do_ need the extended path; we just do no (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2007-05-25 20:39:10 -0400 (Fri, 25 May 2007)
New Revision: 10349

Modified:
   tor/trunk/
   tor/trunk/acinclude.m4
Log:
 r12992 at catbus:  nickm | 2007-05-25 20:39:07 -0400
 Oops. we actually _do_ need the extended path; we just do not want to persist it.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12992] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/acinclude.m4
===================================================================
--- tor/trunk/acinclude.m4	2007-05-26 00:35:29 UTC (rev 10348)
+++ tor/trunk/acinclude.m4	2007-05-26 00:39:10 UTC (rev 10349)
@@ -144,6 +144,7 @@
 if test -z "$CROSS_COMPILE"; then
   AC_CACHE_CHECK([whether we need extra options to link $1],
                  tor_cv_library_$1_linker_option, [
+   orig_LDFLAGS="$LDFLAGS"
    runs=no
    linked_with=nothing
    if test -d "$tor_cv_library_$1_dir/lib"; then
@@ -154,9 +155,9 @@
    for tor_tryextra in "(none)" "-Wl,-R$tor_trydir" "-R$tor_trydir" \
                        "-Wl,-rpath,$tor_trydir" ; do
      if test "$tor_tryextra" = "(none)"; then
-       LDFLAGS="$tor_saved_LDFLAGS"
+       LDFLAGS="$orig_LDFLAGS"
      else
-       LDFLAGS="$tor_tryextra $tor_saved_LDFLAGS"
+       LDFLAGS="$tor_tryextra $orig_LDFLAGS"
      fi
      AC_RUN_IFELSE(AC_LANG_PROGRAM([$5], [$6]),
                    [runnable=yes], [runnable=no])
@@ -169,7 +170,7 @@
    if test "$runnable" = no; then
      AC_MSG_ERROR([Found linkable $1 in $tor_cv_library_$1_dir, but it does not seem to run, even with -R. Maybe specify another using $7}])
    fi
-   LDFLAGS="$tor_saved_LDFLAGS"
+   LDFLAGS="$orig_LDFLAGS"
   ]) dnl end cache check check for extra options.
 
   if test "$tor_cv_library_$1_linker_option" != "(none)" ; then