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 9ec7ca2eb27a2a45de772409456fe97876aa9b82..9e0f69958714fb76d7a1b993368c08317fe57496 100644 (file)
--- 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                        \