GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	configure.in
This commit is contained in:
Nick Mathewson 2012-02-14 15:44:03 -05:00
commit a37cbfdafc
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -176,6 +176,7 @@ else
fi fi
AC_SUBST(EV_LIB_WS32) AC_SUBST(EV_LIB_WS32)
AC_SUBST(EV_LIB_GDI) AC_SUBST(EV_LIB_GDI)
AC_SUBST(OPENSSL_LIBADD)
AC_SYS_LARGEFILE AC_SYS_LARGEFILE

6
m4/libevent_openssl.m4
View File

@ -13,7 +13,7 @@ case "$enable_openssl" in
OPENSSL_LIBS=`$PKG_CONFIG --libs openssl 2>/dev/null` OPENSSL_LIBS=`$PKG_CONFIG --libs openssl 2>/dev/null`
case "$OPENSSL_LIBS" in 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 have_openssl=yes
;; ;;
esac esac
@ -28,9 +28,9 @@ case "$enable_openssl" in
OPENSSL_LIBS="" OPENSSL_LIBS=""
AC_SEARCH_LIBS([SSL_new], [ssl], AC_SEARCH_LIBS([SSL_new], [ssl],
[have_openssl=yes [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], [have_openssl=no],
[-lcrypto $EV_LIB_GDI $EV_LIB_WS32]) [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
LIBS="$save_LIBS" LIBS="$save_LIBS"
;; ;;
esac esac

2
sample/Makefile.am
View File

@ -22,7 +22,7 @@ if OPENSSL
AM_CPPFLAGS += $(OPENSSL_INCS) AM_CPPFLAGS += $(OPENSSL_INCS)
noinst_PROGRAMS += le-proxy noinst_PROGRAMS += le-proxy
le_proxy_SOURCES = le-proxy.c 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 endif
verify: verify:

2
test/Makefile.am
View File

@ -65,7 +65,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL if OPENSSL
regress_SOURCES += regress_ssl.c regress_SOURCES += regress_ssl.c
regress_LDADD += ../libevent_openssl.la -lssl -lcrypto regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
endif endif
bench_SOURCES = bench.c bench_SOURCES = bench.c