[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] Minor cleanup of last patch: check system before prefix, so...



Update of /home/or/cvsroot/tor
In directory moria:/tmp/cvs-serv1051

Modified Files:
	configure.in 
Log Message:
Minor cleanup of last patch: check system before prefix, so we dont believe that libevent is /usr/local/lib when it is in /usr.

Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/tor/configure.in,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -d -r1.255 -r1.256
--- configure.in	27 Jan 2006 00:16:06 -0000	1.255
+++ configure.in	27 Jan 2006 01:47:43 -0000	1.256
@@ -108,18 +108,15 @@ dnl Where do you live, libevent?  And ho
 
 saved_LIBS="$LIBS"
 saved_LDFLAGS="$LDFLAGS"
-if test "x$prefix" != "xNONE" ; then
-        trylibeventdir="$trylibeventdir $prefix"
-fi
 
 AC_CACHE_CHECK([for libevent location], ac_cv_libevent_dir, [
-  for ledir in $trylibeventdir "" /usr/local ; do
+  for ledir in $trylibeventdir "" $prefix /usr/local ; do
     LDFLAGS="$saved_LDFLAGS"
     LIBS="$saved_LIBS -levent"
-    
+
     # Skip the directory if it isn't there.
     if test ! -z "$ledir" -a ! -d "$ledir" ; then
-       continue;  
+       continue;
     fi
     if test ! -z "$ledir" ; then
       if test -d "$ledir/lib" ; then