Move event-config.h to include/event2

This change means that all required include files are in event2, and all files not in event2/* are optional.
2025-08-04 01:36:23 -04:00 · 2010-07-07 16:45:03 -04:00 · 2010-07-07 16:45:03 -04:00 · ec347b9225
commit ec347b9225
parent 5fa30d2bf4
86 changed files with 100 additions and 97 deletions
--- a/.gitignore
+++ b/.gitignore
@ -66,6 +66,8 @@ libevent.pc
 /missing
 /stamp-h1

+/include/event2/event-config.h
+
 /sample/dns-example
 /sample/event-test
 /sample/hello-world
--- a/Makefile.am
+++ b/Makefile.am
@ -135,10 +135,11 @@ if SIGNAL_SUPPORT
 SYS_SRC += signal.c
 endif

-BUILT_SOURCES = event-config.h
+BUILT_SOURCES = ./include/event2/event-config.h

-event-config.h: config.h
-	echo '/* event-config.h' > $@
+./include/event2/event-config.h: config.h
+	@MKDIR_P@ ./include/event2
+	echo '/* event2/event-config.h' > $@
 	echo ' *' >> $@
 	echo ' * This file was generated by autoconf when libevent was built, and post-' >> $@
 	echo ' * processed by Libevent so that its macros would have a uniform prefix.' >> $@
@ -147,8 +148,8 @@ event-config.h: config.h
 	echo ' *' >> $@
 	echo ' * Do not rely on macros in this file existing in later versions.'>> $@
 	echo ' */' >> $@
-	echo '#ifndef _EVENT_CONFIG_H_' >> $@
-	echo '#define _EVENT_CONFIG_H_' >> $@
+	echo '#ifndef _EVENT2_EVENT_CONFIG_H_' >> $@
+	echo '#define _EVENT2_EVENT_CONFIG_H_' >> $@

 	sed -e 's/#define /#define _EVENT_/' \
 	    -e 's/#undef /#undef _EVENT_/' \
@ -201,15 +202,13 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
 	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \
 	changelist-internal.h iocp-internal.h \
 	ratelim-internal.h \
-	WIN32-Code/event-config.h \
+	WIN32-Code/event2/event-config.h \
 	WIN32-Code/tree.h \
 	compat/sys/queue.h

 include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h

-nodist_include_HEADERS = event-config.h
-
-INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include $(SYS_INCLUDES)
+INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)

 verify: check

@ -217,4 +216,5 @@ doxygen: FORCE
 	doxygen $(srcdir)/Doxyfile
 FORCE:

-DISTCLEANFILES = *~ event-config.h libevent.pc
+DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h
+
--- a/WIN32-Code/event2/event-config.h
+++ b/WIN32-Code/event2/event-config.h
@ -1,4 +1,4 @@
-/* event-config.h
+/* event2/event-config.h
 *
 * This file was generated by autoconf when libevent was built, and post-
 * processed by Libevent so that its macros would have a uniform prefix.
--- a/buffer.c
+++ b/buffer.c
@ -25,7 +25,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
@ -82,7 +82,7 @@
 #include "event2/bufferevent_compat.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/thread.h"
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "log-internal.h"
 #include "mm-internal.h"
 #include "util-internal.h"
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@ -35,7 +35,7 @@
 #include "event2/buffer_compat.h"
 #include "event2/util.h"
 #include "event2/thread.h"
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 #include "evthread-internal.h"
 #include "evbuffer-internal.h"
--- a/bufferevent-internal.h
+++ b/bufferevent-internal.h
@ -30,7 +30,7 @@
 extern "C" {
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"
 #include "evutil.h"
 #include "defer-internal.h"
 #include "evthread-internal.h"
--- a/bufferevent.c
+++ b/bufferevent.c
@ -27,7 +27,7 @@

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@ -26,7 +26,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_filter.c
+++ b/bufferevent_filter.c
@ -28,7 +28,7 @@

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@ -26,7 +26,7 @@

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_pair.c
+++ b/bufferevent_pair.c
@ -30,7 +30,7 @@
 #include <winsock2.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include "event2/util.h"
 #include "event2/buffer.h"
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@ -28,7 +28,7 @@

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/configure.in
+++ b/configure.in
@ -18,6 +18,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_MKDIR_P

 AC_PROG_GCC_TRADITIONAL

--- a/defer-internal.h
+++ b/defer-internal.h
@ -30,7 +30,7 @@
 extern "C" {
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>

 struct deferred_cb;
--- a/devpoll.c
+++ b/devpoll.c
@ -24,7 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/resource.h>
--- a/epoll.c
+++ b/epoll.c
@ -24,7 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <stdint.h>
 #include <sys/types.h>
--- a/evbuffer-internal.h
+++ b/evbuffer-internal.h
@ -31,7 +31,7 @@
 extern "C" {
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"
 #include "event2/util.h"
 #include "util-internal.h"
 #include "defer-internal.h"
--- a/evdns.c
+++ b/evdns.c
@ -35,7 +35,7 @@
 */

 #include <sys/types.h>
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifndef _FORTIFY_SOURCE
 #define _FORTIFY_SOURCE 3
--- a/event-internal.h
+++ b/event-internal.h
@ -31,7 +31,7 @@
 extern "C" {
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>
 #include "event2/event_struct.h"
 #include "minheap-internal.h"
--- a/event.c
+++ b/event.c
@ -24,7 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/event.h
+++ b/event.h
@ -162,7 +162,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@ -1574,7 +1574,7 @@ class CCodeGenerator:
        pre += ( '#include <stdlib.h>\n'
                 '#include <string.h>\n'
                 '#include <assert.h>\n'
-                 '#include <event-config.h>\n'
+                 '#include <event2/event-config.h>\n'
                 '#include <event2/event.h>\n'
                 '#include <event2/buffer.h>\n'
                 '#include <event2/tag.h>\n\n'
--- a/event_tagging.c
+++ b/event_tagging.c
@ -25,7 +25,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
--- a/evmap.c
+++ b/evmap.c
@ -23,7 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/evport.c
+++ b/evport.c
@ -50,7 +50,7 @@
 * As in the select(2) implementation, signals are handled by evsignal.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/time.h>
 #include <sys/queue.h>
--- a/evrpc.c
+++ b/evrpc.c
@ -24,7 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
--- a/evthread-internal.h
+++ b/evthread-internal.h
@ -31,7 +31,7 @@ extern "C" {
 #endif

 #include <event2/thread.h>
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"

 struct event_base;
--- a/evthread.c
+++ b/evthread.c
@ -24,7 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifndef _EVENT_DISABLE_THREAD_SUPPORT

--- a/evthread_pthread.c
+++ b/evthread_pthread.c
@ -23,7 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */
 #define _GNU_SOURCE
--- a/evthread_win32.c
+++ b/evthread_win32.c
@ -23,7 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/evutil.c
+++ b/evutil.c
@ -24,7 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #define _GNU_SOURCE

--- a/evutil_rand.c
+++ b/evutil_rand.c
@ -32,7 +32,7 @@
 * so that other people can rip it out and use it for whatever.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include "util-internal.h"
 #include "evthread-internal.h"
--- a/http.c
+++ b/http.c
@ -25,7 +25,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT_HAVE_SYS_PARAM_H
 #include <sys/param.h>
--- a/include/Makefile.am
+++ b/include/Makefile.am
@ -27,5 +27,5 @@ EVENT2_EXPORT = \

 EXTRA_SRC = $(EVENT2_EXPORT)

-nobase_include_HEADERS = $(EVENT2_EXPORT)
+nobase_include_HEADERS = $(EVENT2_EXPORT) ./event2/event-config.h

--- a/include/event2/buffer.h
+++ b/include/event2/buffer.h
@ -65,7 +65,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #include <stdarg.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
--- a/include/event2/bufferevent.h
+++ b/include/event2/bufferevent.h
@ -54,7 +54,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/bufferevent_ssl.h
+++ b/include/event2/bufferevent_ssl.h
@ -31,7 +31,7 @@
    OpenSSL support for bufferevents.
 */

-#include <event-config.h>
+#include <event2/event-config.h>
 #include <event2/bufferevent.h>
 #include <event2/util.h>

--- a/include/event2/bufferevent_struct.h
+++ b/include/event2/bufferevent_struct.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/dns_compat.h
+++ b/include/event2/dns_compat.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/dns_struct.h
+++ b/include/event2/dns_struct.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/event.h
+++ b/include/event2/event.h
@ -37,7 +37,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/event_compat.h
+++ b/include/event2/event_compat.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/event_struct.h
+++ b/include/event2/event_struct.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/http_compat.h
+++ b/include/event2/http_compat.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/http_struct.h
+++ b/include/event2/http_struct.h
@ -38,7 +38,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/tag.h
+++ b/include/event2/tag.h
@ -37,7 +37,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
--- a/include/event2/thread.h
+++ b/include/event2/thread.h
@ -57,7 +57,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>

 /** A flag passed to a locking callback when the lock was allocated as a
 * read-write lock, and we want to acquire or release the lock for writing. */
--- a/include/event2/util.h
+++ b/include/event2/util.h
@ -37,7 +37,7 @@
 extern "C" {
 #endif

-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
--- a/ipv6-internal.h
+++ b/ipv6-internal.h
@ -34,7 +34,7 @@
 #ifdef _EVENT_HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <event2/util.h>

 #ifdef __cplusplus
--- a/kqueue.c
+++ b/kqueue.c
@ -26,7 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #define _GNU_SOURCE

--- a/listener.c
+++ b/listener.c
@ -26,7 +26,7 @@

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/log.c
+++ b/log.c
@ -37,7 +37,7 @@
 * SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/minheap-internal.h
+++ b/minheap-internal.h
@ -28,7 +28,7 @@
 #ifndef _MIN_HEAP_H_
 #define _MIN_HEAP_H_

-#include "event-config.h"
+#include "event2/event-config.h"
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event2/util.h"
--- a/poll.c
+++ b/poll.c
@ -26,7 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies

 LDADD = ../libevent.la
-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include

 noinst_PROGRAMS = event-test time-test signal-test dns-example hello-world

--- a/sample/dns-example.c
+++ b/sample/dns-example.c
@ -5,7 +5,7 @@
  XXX It's pretty ugly and should probably be cleaned up.
 */

-#include <event-config.h>
+#include <event2/event-config.h>

 #include <sys/types.h>

--- a/sample/event-test.c
+++ b/sample/event-test.c
@ -8,7 +8,7 @@
 * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent
 */

-#include <event-config.h>
+#include <event2/event-config.h>

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/sample/signal-test.c
+++ b/sample/signal-test.c
@ -6,7 +6,7 @@

 #include <sys/types.h>

-#include <event-config.h>
+#include <event2/event-config.h>

 #include <sys/stat.h>
 #ifndef WIN32
--- a/sample/time-test.c
+++ b/sample/time-test.c
@ -10,7 +10,7 @@

 #include <sys/types.h>

-#include <event-config.h>
+#include <event2/event-config.h>

 #include <sys/stat.h>
 #ifndef WIN32
--- a/select.c
+++ b/select.c
@ -26,7 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
--- a/signal.c
+++ b/signal.c
@ -26,7 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
--- a/strlcpy-internal.h
+++ b/strlcpy-internal.h
@ -5,7 +5,7 @@
 extern "C" {
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifndef _EVENT_HAVE_STRLCPY
 #include <string.h>
--- a/strlcpy.c
+++ b/strlcpy.c
@ -33,7 +33,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp

 #include <sys/types.h>

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifndef _EVENT_HAVE_STRLCPY
 #include "strlcpy-internal.h"
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign

-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include

 EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c test.sh

@ -44,7 +44,7 @@ endif

 regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
 regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \
-	-I$(top_srcdir)/include  $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
+	-I$(top_srcdir)/include -I../include $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
 regress_LDFLAGS = $(PTHREAD_CFLAGS)

 if OPENSSL
--- a/test/bench.c
+++ b/test/bench.c
@ -33,7 +33,7 @@
 *
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/bench_cascade.c
+++ b/test/bench_cascade.c
@ -25,7 +25,7 @@
 *
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/bench_http.c
+++ b/test/bench_http.c
@ -25,7 +25,7 @@
 *
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress.c
+++ b/test/regress.c
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_bufferevent.c
+++ b/test/regress_bufferevent.c
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event2/event_compat.h"
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@ -31,7 +31,7 @@
 #include <ws2tcpip.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_et.c
+++ b/test/regress_et.c
@ -24,7 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <event-config.h>
+#include <event2/event-config.h>

 #ifdef WIN32
 #include <winsock2.h>
--- a/test/regress_http.c
+++ b/test/regress_http.c
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_main.c
+++ b/test/regress_main.c
@ -32,7 +32,7 @@
 #include <fcntl.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef _EVENT___func__
 #define __func__ _EVENT___func__
@ -71,7 +71,7 @@
 #include <event2/dns_compat.h>
 #include <event2/thread.h>

-#include "event-config.h"
+#include "event2/event-config.h"
 #include "regress.h"
 #include "tinytest.h"
 #include "tinytest_macros.h"
--- a/test/regress_pthread.c
+++ b/test/regress_pthread.c
@ -24,7 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <stdio.h>
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_testutils.c
+++ b/test/regress_testutils.c
@ -30,7 +30,7 @@
 #include <ws2tcpip.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_util.c
+++ b/test/regress_util.c
@ -29,7 +29,7 @@
 #include <ws2tcpip.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>

--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@ -29,7 +29,7 @@
 #include <windows.h>
 #endif

-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #ifndef WIN32
--- a/test/test-changelist.c
+++ b/test/test-changelist.c
@ -2,7 +2,7 @@
 *  based on test-eof.c
 */

-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/test/test-eof.c
+++ b/test/test-eof.c
@ -2,7 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/test/test-init.c
+++ b/test/test-init.c
@ -2,7 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/test-time.c
+++ b/test/test-time.c
@ -2,7 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/test-weof.c
+++ b/test/test-weof.c
@ -2,7 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#include "event-config.h"
+#include "event2/event-config.h"

 #ifdef WIN32
 #include <winsock2.h>
--- a/util-internal.h
+++ b/util-internal.h
@ -26,7 +26,7 @@
 #ifndef _EVENT_UTIL_INTERNAL_H
 #define _EVENT_UTIL_INTERNAL_H

-#include "event-config.h"
+#include "event2/event-config.h"
 #include <errno.h>

 /* For EVUTIL_ASSERT */
--- a/win32select.c
+++ b/win32select.c
@ -38,7 +38,7 @@
 #include <errno.h>

 #include "event2/util.h"
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 #include "log-internal.h"
 #include "event2/event.h"