diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-11-21 23:50:31 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-11-21 23:50:31 +0000 |
| commit | d97c759138c47ad3428467c8626a7f316f4dae10 (patch) | |
| tree | 50f86c1f7c704ca512c9d45900550ab81c85421f | |
| parent | facc49cf6f9fe2375f1c15a8caff92d904b52edd (diff) | |
| download | tor-d97c759138c47ad3428467c8626a7f316f4dae10.tar tor-d97c759138c47ad3428467c8626a7f316f4dae10.tar.gz | |
r9372@totoro: nickm | 2006-11-21 10:59:47 -0500
Small cross-compilation fixes.
svn:r8980
| -rw-r--r-- | configure.in | 8 | ||||
| -rwxr-xr-x | contrib/cross.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 29d25ea28..157f5e418 100644 --- a/configure.in +++ b/configure.in @@ -281,8 +281,8 @@ AC_CACHE_CHECK([whether we need extra options to link libevent], 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 @@ int main(void) 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 diff --git a/contrib/cross.sh b/contrib/cross.sh index dc9716039..e660be780 100755 --- a/contrib/cross.sh +++ b/contrib/cross.sh @@ -124,7 +124,7 @@ then exit $EXITVAL fi -if [ ! -z $GEN_BUILD -a ! -f configure ] +if [ ! -z "$GEN_BUILD" -a ! -f configure ] then export NOCONF=yes ./autogen.sh |