Merge remote branch 'origin/maint-0.2.1'

This commit is contained in:
Nick Mathewson 2010-02-02 16:21:17 -05:00
commit 1a2129e3f7

View file

@ -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 ------------------------------------------------------