From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 May 2011 22:54:06 +0000 (-0400)
Subject: Don't build libevent with openssl support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6746cc63ea709a46baa5231fb932cffec08449;p=thirdparty%2Fntp.git

Don't build libevent with openssl support

bk: 4ddeda0eOtOW2Z3M3YQywgvaLvj5hQ
---

diff --git a/ChangeLog b/ChangeLog
index c4363cd757..a86ed8310a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Don't build libevent with openssl support.  Right now, libevent
+  doesn't use pkg-config to find openssl's installation location.
 (4.2.7p173) 2011/05/25 Released by Harlan Stenn <stenn@ntp.org>
 * Typo in emalloc.c hides file and line number from emalloc() error msg.
 * parsesolaris.c compile fails on SPARC Solaris with conflicting printf.
diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 624e16059d..2d31d1dc85 100644
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -113,6 +113,7 @@ esac
 case "$ntp_use_local_libevent" in
  yes)
     dnl ac_configure_args is undocumented but widely abused.
+    ac_configure_args=" --disable-openssl${ac_configure_args}"
     ac_configure_args=" --disable-shared${ac_configure_args}"
     ac_configure_args=" --disable-libevent-regress${ac_configure_args}"
     ac_configure_args=" --disable-libevent-install${ac_configure_args}"