From 92781968475c7553a08f5b4161f1df631c6ef01f Mon Sep 17 00:00:00 2001
From: Mark Ellzey <mark.thomas@mandiant.com>
Date: Tue, 14 Feb 2012 15:01:02 -0500
Subject: [PATCH 1/2] Added OPENSSL_LDFLAGS env variable which is appended to
 SSL checks.

If openssl is not installed system-wide or not compiled as a shared library,
some systems require various link flags (e.g., -ld).
---
 configure.in       | 5 +++--
 sample/Makefile.am | 2 +-
 test/Makefile.am   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 63eb75e9..cb73671f 100644
--- a/configure.in
+++ b/configure.in
@@ -154,6 +154,7 @@ else
 fi
 AC_SUBST(EV_LIB_WS32)
 AC_SUBST(EV_LIB_GDI)
+AC_SUBST(OPENSSL_LDFLAGS)
 
 AC_CHECK_HEADERS([openssl/bio.h])
 
@@ -164,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_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LDFLAGS"
 	AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl])],
 	[have_openssl=no],
-	[-lcrypto $EV_LIB_GDI $EV_LIB_WS32])
+	[-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LDFLAGS])
 LIBS="$save_LIBS"
 AC_SUBST(OPENSSL_LIBS)
 fi
diff --git a/sample/Makefile.am b/sample/Makefile.am
index 234feb40..d9b15fc1 100644
--- 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
+le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LDFLAGS}
 endif
 
 verify:
diff --git a/test/Makefile.am b/test/Makefile.am
index 1beb51d8..1842eb90 100644
--- 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
+regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LDFLAGS}
 endif
 
 bench_SOURCES = bench.c

From 2d67b638536d33bd84173238a9c933f04aaed15c Mon Sep 17 00:00:00 2001
From: Mark Ellzey <mark.thomas@mandiant.com>
Date: Tue, 14 Feb 2012 15:37:58 -0500
Subject: [PATCH 2/2] Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD

---
 configure.in       | 6 +++---
 sample/Makefile.am | 2 +-
 test/Makefile.am   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index cb73671f..8739dd90 100644
--- 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 d9b15fc1..c926f4e6 100644
--- 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 1842eb90..b10c41a8 100644
--- 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