diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-02-14 15:44:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-14 15:44:03 -0500 |
| commit | a37cbfdafc0f9c9d507cf716c2acff612c1af79b (patch) | |
| tree | 5b15c3282879c1eb7337087447c35acfc96b70d1 /m4 | |
| parent | 2ed44302250bbec1ffe15ff78a0d41c899595ccc (diff) | |
| parent | 2d67b638536d33bd84173238a9c933f04aaed15c (diff) | |
| download | libevent-a37cbfdafc0f9c9d507cf716c2acff612c1af79b.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
configure.in
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libevent_openssl.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 index 7b273255..3cb064a0 100644 --- a/m4/libevent_openssl.m4 +++ b/m4/libevent_openssl.m4 @@ -13,7 +13,7 @@ case "$enable_openssl" in OPENSSL_LIBS=`$PKG_CONFIG --libs openssl 2>/dev/null` case "$OPENSSL_LIBS" in '') ;; - *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32" + *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD" have_openssl=yes ;; esac @@ -28,9 +28,9 @@ case "$enable_openssl" in OPENSSL_LIBS="" AC_SEARCH_LIBS([SSL_new], [ssl], [have_openssl=yes - OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32"], + OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"], [have_openssl=no], - [-lcrypto $EV_LIB_GDI $EV_LIB_WS32]) + [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD]) LIBS="$save_LIBS" ;; esac |