[or-cvs] r8980: Small cross-compilation fixes. (in tor/trunk: . contrib)

[nickm at seul.org]

Author: nickm
Date: 2006-11-21 18:50:31 -0500 (Tue, 21 Nov 2006)
New Revision: 8980

Modified:
   tor/trunk/
   tor/trunk/configure.in
   tor/trunk/contrib/cross.sh
Log:
 r9372 at totoro:  nickm | 2006-11-21 10:59:47 -0500
 Small cross-compilation fixes.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9372] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2006-11-21 23:50:21 UTC (rev 8979)
+++ tor/trunk/configure.in	2006-11-21 23:50:31 UTC (rev 8980)
@@ -281,8 +281,8 @@
                 int main(int c, char **v) {
                    event_init(); return 0;
                 }],
-                libevent_runs=yes, libevent_runs=no)
-      if test $libevent_runs = yes ; then
+                libevent_runs=yes, libevent_runs=no, libevent_runs=cross)
+      if test $libevent_runs != no ; then
         if test -z "$le_extra" ; then
           ac_cv_libevent_linker_option='(none)'
         else
@@ -402,8 +402,8 @@
         return(RAND_status() <= 0);
 }
                         ],
-                openssl_runs=yes, openssl_runs=no)
-      if test $openssl_runs = yes ; then
+                openssl_runs=yes, openssl_runs=no, openssl_runs=cross)
+      if test $openssl_runs != no ; then
         if test "$linked_with" = nothing; then
            linked_with="$ssl_extra"
         fi

Modified: tor/trunk/contrib/cross.sh
===================================================================
--- tor/trunk/contrib/cross.sh	2006-11-21 23:50:21 UTC (rev 8979)
+++ tor/trunk/contrib/cross.sh	2006-11-21 23:50:31 UTC (rev 8980)
@@ -124,7 +124,7 @@
   exit $EXITVAL
 fi
 
-if [ ! -z $GEN_BUILD -a ! -f configure ]
+if [ ! -z "$GEN_BUILD" -a ! -f configure ]
 then
   export NOCONF=yes
   ./autogen.sh