Skip to content
Browse files

Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	configure.in
  • Loading branch information...
2 parents 2ed4430 + 2d67b63 commit a37cbfdafc0f9c9d507cf716c2acff612c1af79b Nick Mathewson committed Feb 14, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −0 configure.in
  2. +3 −3 m4/libevent_openssl.m4
  3. +1 −1 sample/Makefile.am
  4. +1 −1 test/Makefile.am
View
1 configure.in
@@ -176,6 +176,7 @@ else
fi
AC_SUBST(EV_LIB_WS32)
AC_SUBST(EV_LIB_GDI)
+AC_SUBST(OPENSSL_LIBADD)
AC_SYS_LARGEFILE
View
6 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
View
2 sample/Makefile.am
@@ -22,7 +22,7 @@ if OPENSSL
AM_CPPFLAGS += $(OPENSSL_INCS)
noinst_PROGRAMS += le-proxy
le_proxy_SOURCES = le-proxy.c
-le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto
+le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
endif
verify:
View
2 test/Makefile.am
@@ -65,7 +65,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL
regress_SOURCES += regress_ssl.c
-regress_LDADD += ../libevent_openssl.la -lssl -lcrypto
+regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
endif
bench_SOURCES = bench.c

0 comments on commit a37cbfd

Please sign in to comment.
Something went wrong with that request. Please try again.