Procházet zdrojové kódy

Link libssl and libcrypto in the right order.

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.
Nick Mathewson před 16 roky
rodič
revize
f6ff14a82e
1 změnil soubory, kde provedl 2 přidání a 3 odebrání
  1. 2 3
      configure.in

+ 2 - 3
configure.in

@@ -326,12 +326,11 @@ if test "$enable_static_openssl" = "yes"; then
    if test "$tor_cv_library_openssl_dir" = "(system)"; 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")
      AC_MSG_ERROR("You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl")
    else
    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
    fi
 else
 else
-     TOR_OPENSSL_LIBS="-lcrypto -lssl"
+     TOR_OPENSSL_LIBS="-lssl -lcrypto"
 fi
 fi
-echo "TOR_OPENSSL_LIBS=$TOR_OPENSSL_LIBS"
 AC_SUBST(TOR_OPENSSL_LIBS)
 AC_SUBST(TOR_OPENSSL_LIBS)
 
 
 dnl ------------------------------------------------------
 dnl ------------------------------------------------------