From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 22 Apr 2018 21:52:57 +0000 (+0300)
Subject: Merge branch 'pull-628'
X-Git-Tag: release-2.1.9-beta^2~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e56c8b2da4f8457e6d82b329deae889a3fce868;p=libevent

Merge branch 'pull-628'

* pull-628:
  Give priority to the build directory headers
  Do not ship evconfig-private.h in dist archive

Closes: #628
(cherry picked from commit a5f19422fdc91cf1e645fc318a174f33f132b9ac)
---

diff --git a/Makefile.am b/Makefile.am
index 9ec7ca2e..9e0f6995 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,7 +229,7 @@ MAYBE_CORE =
 endif
 
 AM_CFLAGS = $(LIBEVENT_CFLAGS)
-AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/compat -I./include -I$(srcdir)/include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS)
 AM_LDFLAGS = $(LIBEVENT_LDFLAGS)
 
 GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) $(AM_LDFLAGS)
@@ -269,7 +269,6 @@ noinst_HEADERS +=				\
 	defer-internal.h			\
 	epolltable-internal.h			\
 	evbuffer-internal.h			\
-	evconfig-private.h			\
 	event-internal.h			\
 	evmap-internal.h			\
 	evrpc-internal.h			\