diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-10-03 09:19:33 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-10-03 09:19:33 +0000 |
| commit | 32d4ffa8ee14f460007d6f4a6e2af3ef21b0cb00 (patch) | |
| tree | d1ea606db678a0637a59d99567c8815f2532d8ca /m4 | |
| parent | 584af68e190898da1bc1676baf743288ba46af19 (diff) | |
2010-10-02 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed compile error on OpenBSD4.7(i386). In openssl.m4, we first
search libcrypto and then libssl because libssl depends on
libcrypto on OpenBSD.
* src/Netrc.cc
* src/Netrc.h
* src/Triplet.h
* src/openssl.m4
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openssl.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 68a4bfb0..e3ed9261 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -36,10 +36,11 @@ if test "x$have_openssl" != "xyes"; then LIBS="-L$openssl_prefix_lib $LIBS" CPPFLAGS="-I$openssl_prefix_include $CPPFLAGS" - AC_CHECK_LIB([ssl], [SSL_library_init], [have_openssl=yes LIBS="-lssl $LIBS"]) + # First check libcrypto, because libssl may depend on it + AC_CHECK_LIB([crypto], [main], [have_openssl=yes; LIBS="-lcrypto $LIBS"]) if test "x$have_openssl" = "xyes"; then have_openssl=no - AC_CHECK_LIB([crypto], [main], [have_openssl=yes; LIBS="-lcrypto $LIBS"]) + AC_CHECK_LIB([ssl], [SSL_library_init], [have_openssl=yes LIBS="-lssl $LIBS"]) if test "x$have_openssl" = "xyes"; then OPENSSL_LIBS="-L$openssl_prefix_lib -lssl -lcrypto" OPENSSL_CFLAGS="-I$openssl_prefix_include" |