From: Dave Hart <hart@ntp.org>
Date: Wed, 2 Mar 2011 06:13:26 +0000 (+0000)
Subject: [Bug 1839] 4.2.7p135 still installs libevent ev*.h headers.
X-Git-Tag: NTP_4_2_7P136~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26ada05ed1857a57c52f8fdb03c7d57917d878e;p=thirdparty%2Fntp.git

[Bug 1839] 4.2.7p135 still installs libevent ev*.h headers.

bk: 4d6de006yaocdf9wC8GlZ2-2bClI0Q
---

diff --git a/ChangeLog b/ChangeLog
index 57211c757..4efb9493e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1839] 4.2.7p135 still installs libevent ev*.h headers.
 (4.2.7p135) 2011/03/02 Released by Harlan Stenn <stenn@ntp.org>
 * libevent: When building on systems with CLOCK_MONOTONIC available,
   separate the internal timeline (possibly counting since system boot)
diff --git a/sntp/libevent/Makefile.am b/sntp/libevent/Makefile.am
index 498ef9728..5eb2ed820 100644
--- a/sntp/libevent/Makefile.am
+++ b/sntp/libevent/Makefile.am
@@ -217,9 +217,15 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
 	WIN32-Code/tree.h \
 	compat/sys/queue.h
 
-include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
+EVENT1_HDRs = event.h evhttp.h evdns.h evrpc.h evutil.h
 
-INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
+if INSTALL_LIBEVENT
+include_HEADERS = $(EVENT1_HDRS)
+else
+noinst_HEADERS += $(EVENT1_HDRS)
+endif
+
+AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
 
 verify: check