Module Name: src Committed By: bouyer Date: Sat Sep 5 12:55:11 UTC 2009
Modified Files: src/lib/libevent [netbsd-5]: Makefile event.h Log Message: Pull up following revision(s) (requested by tls in ticket #920): lib/libevent/Makefile: revisions 1.7, 1.8 lib/libevent/event.h: revisions 1.7 Matthias Drochner pointed out that I lost the _EVENT_ prefix from all the autoconf defines in the installed event_config.h. Fix this approximately as the stock libevent Makefile does. Also, some applications written for newer libevent want event.h to pull in event_config.h by magic. To generate a diff of this commit: cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/lib/libevent/Makefile cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/lib/libevent/event.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libevent/Makefile diff -u src/lib/libevent/Makefile:1.4.4.2 src/lib/libevent/Makefile:1.4.4.3 --- src/lib/libevent/Makefile:1.4.4.2 Tue Aug 4 18:39:30 2009 +++ src/lib/libevent/Makefile Sat Sep 5 12:55:11 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.4.2 2009/08/04 18:39:30 snj Exp $ +# $NetBSD: Makefile,v 1.4.4.3 2009/09/05 12:55:11 bouyer Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 NOLINT= # Until someone explains to me how to avoid lint stupidity @@ -11,12 +11,9 @@ SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c evrpc.c evutil.c \ http.c kqueue.c log.c poll.c signal.c -INCS= evdns.h event.h evhttp.h evrpc.h evutil.h +INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event-config.h INCSDIR=/usr/include -INCS+= config.h -INCSNAME_config.h= event-config.h - MAN= evdns.3 event.3 MLINKS+=event.3 event_init.3 @@ -92,4 +89,7 @@ MLINKS+=evdns.3 evdns_search_ndots_set.3 MLINKS+=evdns.3 evdns_set_log_fn.3 +event-config.h: config.h + sed -e 's/#define /#define _EVENT_/' ${.ALLSRC} > ${.OBJDIR}/${.TARGET} + .include <bsd.lib.mk> Index: src/lib/libevent/event.h diff -u src/lib/libevent/event.h:1.5.4.1 src/lib/libevent/event.h:1.5.4.2 --- src/lib/libevent/event.h:1.5.4.1 Tue Aug 4 18:32:08 2009 +++ src/lib/libevent/event.h Sat Sep 5 12:55:11 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: event.h,v 1.5.4.1 2009/08/04 18:32:08 snj Exp $ */ +/* $NetBSD: event.h,v 1.5.4.2 2009/09/05 12:55:11 bouyer Exp $ */ /* $OpenBSD: event.h,v 1.4 2002/07/12 18:50:48 provos Exp $ */ /* @@ -165,6 +165,7 @@ extern "C" { #endif +#include <event-config.h> #include <sys/types.h> #include <sys/time.h> #include <stdint.h>