Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD

diff --git a/configure.in b/configure.in
index cb73671f79574b6eb960f239bd9f56df598613cb..8739dd90c4155c076dcd2993c6fc60395ca69614 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -154,7 +154,7 @@ else
 fi
 AC_SUBST(EV_LIB_WS32)
 AC_SUBST(EV_LIB_GDI)
-AC_SUBST(OPENSSL_LDFLAGS)
+AC_SUBST(OPENSSL_LIBADD)
 
 AC_CHECK_HEADERS([openssl/bio.h])
 
@@ -165,10 +165,10 @@ OPENSSL_LIBS=""
 have_openssl=no
 AC_SEARCH_LIBS([SSL_new], [ssl],
        [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])],
        [have_openssl=no],
-       [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LDFLAGS])
+       [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
 LIBS="$save_LIBS"
 AC_SUBST(OPENSSL_LIBS)
 fi

diff --git a/sample/Makefile.am b/sample/Makefile.am
index d9b15fc10c5e987a283745b01e4ddddeb181a90d..c926f4e6fbddd2d6b39e44380c8e722fbe80cf55 100644 (file)
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -21,7 +21,7 @@ http_server_SOURCES = http-server.c
 if OPENSSL
 noinst_PROGRAMS += le-proxy
 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
 
 verify:

diff --git a/test/Makefile.am b/test/Makefile.am
index 1842eb9029ae8a762288d043206d046b33883a41..b10c41a8894c86f007d4987b29bff4a03680aca5 100644 (file)
--- a/test/Makefile.am
+++ b/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 ${OPENSSL_LDFLAGS}
+regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
 endif
 
 bench_SOURCES = bench.c