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

bk: 4d6de006yaocdf9wC8GlZ2-2bClI0Q

diff --git a/ChangeLog b/ChangeLog
index 57211c757966f8e56ee39dc92d9cc357afb7445e..4efb9493e1ed31f6431b715d7c6beb3537c2004c 100644 (file)
--- 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 498ef97287659d7a22c43378fa2316dfc4fee3c9..5eb2ed820c67dd809662bff71fac9eac9a5f8548 100644 (file)
--- 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