make evconfig.h available as installed header file; not

really ideal but good enough for me; from Nick Mathewson


svn:r339

Makefile.am

@@ -14,7 +14,7 @@ EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
 	test/test-eof.c test/test-weof.c test/test-time.c \
 	test/test-init.c test/test.sh \
 	compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h \
-	WIN32-Code/config.h WIN32-Code/misc.c \
+	WIN32-Code/evconfig.h WIN32-Code/misc.c \
 	WIN32-Code/win32.c WIN32-Code/misc.h \
 	WIN32-Prj/event_test/event_test.dsp \
 	WIN32-Prj/event_test/test.txt WIN32-Prj/libevent.dsp \
@@ -46,7 +46,7 @@ libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
 libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
 
-include_HEADERS = event.h evhttp.h evdns.h
+include_HEADERS = event.h evhttp.h evdns.h evconfig.h
 
 INCLUDES = -Icompat $(SYS_INCLUDES)
 

WIN32-Code/win32.c

@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _MSC_VER
-#include "config.h"
+#include "evconfig.h"
 #else
 /* Avoid the windows/msvc thing. */
-#include "../config.h"
+#include "../evconfig.h"
 #endif
 
 #include <windows.h>

WIN32-Prj/libevent.dsp

@@ -109,7 +109,7 @@ SOURCE=..\acconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\WIN32-Code\config.h"
+SOURCE="..\WIN32-Code\evconfig.h"
 # End Source File
 # Begin Source File
 

buffer.c

@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_VASPRINTF

configure.in

@@ -3,7 +3,7 @@ dnl Dug Song <dugsong@monkey.org>
 AC_INIT(event.c)
 
 AM_INIT_AUTOMAKE(libevent,1.3a)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(evconfig.h)
 AM_MAINTAINER_MODE
 
 dnl Initialize prefix.

devpoll.c

@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

epoll.c

@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <stdint.h>

evbuffer.c

@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

evdns.c

@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32

event.c

@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32

event.h

@@ -31,6 +31,7 @@
 extern "C" {
 #endif
 
+#include <evconfig.h>
 #include <stdarg.h>
 
 #ifdef WIN32

event_tagging.c

@@ -29,7 +29,7 @@
 #include <sys/param.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32

evport.c

@@ -52,7 +52,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

evrpc.c

@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32

http.c

@@ -29,7 +29,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

kqueue.c

@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

log.c

@@ -38,7 +38,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32

poll.c

@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

rtsig.c

@@ -148,7 +148,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 /* Enable F_SETSIG and F_SETOWN */

sample/Makefile.am

@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 LDADD = ../libevent.la
 CPPFPLAGS = -I.. 
-CFLAGS = -I../compat
+CFLAGS = -I../compat -I..
 
 noinst_PROGRAMS = event-test time-test signal-test
 

sample/signal-test.c

@@ -5,10 +5,6 @@
 
 #include <sys/types.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>

sample/time-test.c

@@ -2,13 +2,10 @@
  * Compile with:
  * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
  */
+#include <evconfig.h>
 
 #include <sys/types.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>

select.c

@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

signal.c

@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

strlcpy-internal.h

@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY

strlcpy.c

@@ -34,7 +34,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY

test/bench.c

@@ -34,7 +34,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

test/regress.c

@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

test/regress_dns.c

@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

test/regress_http.c

@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>

test/regress_rpc.c

@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>