[or-cvs] [tor/master 1/2] Link libssl and libcrypto in the right order.

nickm at torproject.org nickm at torproject.org
Tue Feb 2 21:22:36 UTC 2010


Author: Nick Mathewson <nickm at torproject.org>
Date: Tue, 2 Feb 2010 16:12:45 -0500
Subject: Link libssl and libcrypto in the right order.
Commit: f6ff14a82ead43e3f5c2a6b2f2ace45ca2f45081

For most linking setups, this doesn't matter.  But for some setups, when
statically linking openssl, it does matter, since you need to link things
with dependencies before you link things they depend on.

Fix for bug 1237.
---
 configure.in |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 92dc45f..86fa2eb 100644
--- a/configure.in
+++ b/configure.in
@@ -326,12 +326,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 ------------------------------------------------------
-- 
1.6.5




More information about the tor-commits mailing list