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

Conflicts:
	configure.in

diff --cc configure.in
index 0e2770feee0427bf6c3c760d587ee8f979aa9c96,8739dd90c4155c076dcd2993c6fc60395ca69614..31eabdb9cfa931ca64bd470aef771beb66da6df0
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -176,10 -154,24 +176,11 @@@ els
  fi
  AC_SUBST(EV_LIB_WS32)
  AC_SUBST(EV_LIB_GDI)
+ AC_SUBST(OPENSSL_LIBADD)
  
 -AC_CHECK_HEADERS([openssl/bio.h])
 +AC_SYS_LARGEFILE
  
 -if test "$enable_openssl" = "yes"; then
 -save_LIBS="$LIBS"
 -LIBS=""
 -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_LIBADD"
 -      AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl])],
 -      [have_openssl=no],
 -      [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
 -LIBS="$save_LIBS"
 -AC_SUBST(OPENSSL_LIBS)
 -fi
 +LIBEVENT_OPENSSL
  
  dnl Checks for header files.
  AC_HEADER_STDC

diff --cc m4/libevent_openssl.m4
index 7b2732550f749f5ab8ea7c6bcf691675fb7a1390,0000000000000000000000000000000000000000..3cb064a0bd369308e00f754e33e3fda2123e245e
mode 100644,000000..100644
--- 1/m4/libevent_openssl.m4
--- /dev/null
+++ b/m4/libevent_openssl.m4
@@@ -1,47 -1,0 +1,47 @@@
-        *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32"
 +dnl ######################################################################
 +dnl OpenSSL support
 +AC_DEFUN([LIBEVENT_OPENSSL], [
 +AC_REQUIRE([NTP_PKG_CONFIG])dnl
 +
 +case "$enable_openssl" in
 + yes)
 +    have_openssl=no
 +    case "$PKG_CONFIG" in
 +     '')
 +      ;;
 +     *)
 +      OPENSSL_LIBS=`$PKG_CONFIG --libs openssl 2>/dev/null`
 +      case "$OPENSSL_LIBS" in
 +       '') ;;
-           OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32"],
++       *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"
 +          have_openssl=yes
 +          ;;
 +      esac
 +      OPENSSL_INCS=`$PKG_CONFIG --cflags openssl 2>/dev/null`
 +      ;;
 +    esac
 +    case "$have_openssl" in
 +     yes) ;;
 +     *)
 +      save_LIBS="$LIBS"
 +      LIBS=""
 +      OPENSSL_LIBS=""
 +      AC_SEARCH_LIBS([SSL_new], [ssl],
 +          [have_openssl=yes
-           [-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 $OPENSSL_LIBADD])
 +      LIBS="$save_LIBS"
 +      ;;
 +    esac
 +    AC_SUBST(OPENSSL_INCS)
 +    AC_SUBST(OPENSSL_LIBS)
 +    case "$have_openssl" in
 +     yes)  AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl]) ;;
 +    esac
 +    ;;
 +esac
 +
 +# check if we have and should use openssl
 +AM_CONDITIONAL(OPENSSL, [test "$enable_openssl" != "no" && test "$have_openssl" = "yes"])
 +])

diff --cc sample/Makefile.am
index be7492b3eec8ec1b8f0edc5709b1f2f85a6b6a47,c926f4e6fbddd2d6b39e44380c8e722fbe80cf55..282d67b1921e0df4f2717fa61e16d1be6f8e210f
--- 1/sample/Makefile.am
--- 2/sample/Makefile.am
+++ b/sample/Makefile.am
@@@ -19,10 -19,9 +19,10 @@@ hello_world_SOURCES = hello-world.
  http_server_SOURCES = http-server.c
  
  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: