cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 09:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD

Browse Source
This commit is contained in:
Mark Ellzey 2012-02-14 15:37:58 -05:00
parent 9278196847
commit 2d67b63853
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -154,7 +154,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_LDFLAGS) AC_SUBST(OPENSSL_LIBADD)
AC_CHECK_HEADERS([openssl/bio.h]) AC_CHECK_HEADERS([openssl/bio.h])
@ -165,10 +165,10 @@ OPENSSL_LIBS=""
have_openssl=no have_openssl=no
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_LDFLAGS" OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"
AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl])], AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl])],
[have_openssl=no], [have_openssl=no],
[-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LDFLAGS]) [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
LIBS="$save_LIBS" LIBS="$save_LIBS"
AC_SUBST(OPENSSL_LIBS) AC_SUBST(OPENSSL_LIBS)
fi fi

2
sample/Makefile.am
View File

@ -21,7 +21,7 @@ http_server_SOURCES = http-server.c
if OPENSSL if OPENSSL
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 ${OPENSSL_LDFLAGS} 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 ${OPENSSL_LDFLAGS} regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
endif endif
bench_SOURCES = bench.c bench_SOURCES = bench.c