diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-02 16:21:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-02 16:21:17 -0500 |
| commit | 1a2129e3f7fffba50306d897ecfd0fb54347a340 (patch) | |
| tree | cf924d2827ec81bee47b2bfcd774406c7f77c69a /configure.in | |
| parent | 3a8ad7bfd85f46e022d17893be20da1bfec49cbe (diff) | |
| parent | f6ff14a82ead43e3f5c2a6b2f2ace45ca2f45081 (diff) | |
| download | tor-1a2129e3f7fffba50306d897ecfd0fb54347a340.tar.gz tor-1a2129e3f7fffba50306d897ecfd0fb54347a340.zip | |
Merge remote branch 'origin/maint-0.2.1'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 0570a1fc6c..f6f4724bdd 100644 --- a/configure.in +++ b/configure.in @@ -334,12 +334,11 @@ if test "$enable_static_openssl" = "yes"; then if test "$tor_cv_library_openssl_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl") else - TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libcrypto.a $TOR_LIBDIR_openssl/libssl.a" + TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a" fi else - TOR_OPENSSL_LIBS="-lcrypto -lssl" + TOR_OPENSSL_LIBS="-lssl -lcrypto" fi -echo "TOR_OPENSSL_LIBS=$TOR_OPENSSL_LIBS" AC_SUBST(TOR_OPENSSL_LIBS) dnl ------------------------------------------------------ |