make evconfig.h available as installed header file; not

really ideal but good enough for me; from Nick Mathewson


svn:r339

32 files changed, 32 insertions, 38 deletions

diff --git a/Makefile.am b/Makefile.am
index 2739922e..5a15ce3e 100644
--- a/Makefile.am
+++ b/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)
 
diff --git a/WIN32-Code/config.h b/WIN32-Code/evconfig.h
index aed9774d..aed9774d 100644
--- a/WIN32-Code/config.h
+++ b/WIN32-Code/evconfig.h
diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c
index 867d1f22..2ba0ae45 100644
--- a/WIN32-Code/win32.c
+++ b/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>
diff --git a/WIN32-Prj/libevent.dsp b/WIN32-Prj/libevent.dsp
index 61e9bc84..67e71c8a 100644
--- a/WIN32-Prj/libevent.dsp
+++ b/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
 
diff --git a/buffer.c b/buffer.c
index 77efd0cf..d33e9292 100644
--- a/buffer.c
+++ b/buffer.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_VASPRINTF
diff --git a/configure.in b/configure.in
index c4faf015..bf5031f2 100644
--- a/configure.in
+++ b/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.
diff --git a/devpoll.c b/devpoll.c
index 6db53eaf..037bb5dc 100644
--- a/devpoll.c
+++ b/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>
diff --git a/epoll.c b/epoll.c
index 19a88a1f..555596b1 100644
--- a/epoll.c
+++ b/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>
diff --git a/evbuffer.c b/evbuffer.c
index 52712bce..ed4f3c37 100644
--- a/evbuffer.c
+++ b/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
diff --git a/evdns.c b/evdns.c
index b1e0644e..67c23dbb 100644
--- a/evdns.c
+++ b/evdns.c
@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
diff --git a/event.c b/event.c
index f6d2b1cc..0a897076 100644
--- a/event.c
+++ b/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
diff --git a/event.h b/event.h
index 3f2032dd..419f3407 100644
--- a/event.h
+++ b/event.h
@@ -31,6 +31,7 @@
 extern "C" {
 #endif
 
+#include <evconfig.h>
 #include <stdarg.h>
 
 #ifdef WIN32
diff --git a/event_tagging.c b/event_tagging.c
index 6b127243..91f903a3 100644
--- a/event_tagging.c
+++ b/event_tagging.c
@@ -29,7 +29,7 @@
 #include <sys/param.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
diff --git a/evport.c b/evport.c
index 8c6dc286..095c17cf 100644
--- a/evport.c
+++ b/evport.c
@@ -52,7 +52,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H
diff --git a/evrpc.c b/evrpc.c
index d575cd14..de3ac0df 100644
--- a/evrpc.c
+++ b/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
diff --git a/http.c b/http.c
index 6ff181de..6b8ea6db 100644
--- a/http.c
+++ b/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
diff --git a/kqueue.c b/kqueue.c
index 08369c6d..1752c9d8 100644
--- a/kqueue.c
+++ b/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>
diff --git a/log.c b/log.c
index c9275e36..0aacbae6 100644
--- a/log.c
+++ b/log.c
@@ -38,7 +38,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
diff --git a/poll.c b/poll.c
index 7c1593f6..f0d9a1e2 100644
--- a/poll.c
+++ b/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>
diff --git a/rtsig.c b/rtsig.c
index 29aade69..09ff0658 100644
--- a/rtsig.c
+++ b/rtsig.c
@@ -148,7 +148,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 /* Enable F_SETSIG and F_SETOWN */
diff --git a/sample/Makefile.am b/sample/Makefile.am
index b749b806..2e3a3457 100644
--- a/sample/Makefile.am
+++ b/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
 
diff --git a/sample/signal-test.c b/sample/signal-test.c
index 98650ca1..63dd9547 100644
--- a/sample/signal-test.c
+++ b/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>
diff --git a/sample/time-test.c b/sample/time-test.c
index f0f93995..daa9daff 100644
--- a/sample/time-test.c
+++ b/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>
diff --git a/select.c b/select.c
index 1e039e1f..f26ec454 100644
--- a/select.c
+++ b/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>
diff --git a/signal.c b/signal.c
index 8a6963b1..7e442713 100644
--- a/signal.c
+++ b/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>
diff --git a/strlcpy-internal.h b/strlcpy-internal.h
index 22b5f61d..43f0ebb5 100644
--- a/strlcpy-internal.h
+++ b/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
diff --git a/strlcpy.c b/strlcpy.c
index 5d194527..d21fec65 100644
--- a/strlcpy.c
+++ b/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
diff --git a/test/bench.c b/test/bench.c
index 61b05025..c97d1e64 100644
--- a/test/bench.c
+++ b/test/bench.c
@@ -34,7 +34,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
diff --git a/test/regress.c b/test/regress.c
index 580b3cab..671a15e7 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
diff --git a/test/regress_dns.c b/test/regress_dns.c
index c65d3570..c940f200 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
diff --git a/test/regress_http.c b/test/regress_http.c
index 3fdaacb4..ae0699b1 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index 785127b9..69031248 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>