--- cvsroot/libev/import_libevent 2007/12/07 20:24:57 1.14 +++ cvsroot/libev/import_libevent 2007/12/22 16:37:08 1.24 @@ -7,9 +7,11 @@ # this program combines libev and libevent into a single package -cvs update -AdP +cvs update -AdP libev rsync -avP libev/. . --exclude CVS +rm -f configure.ac + LE=../libevent-1.4.0-beta cp $LE/evdns.h . @@ -91,7 +93,7 @@ s/\bevent-internal.h\b//g; s/\bevsignal.h\b//g; s/^(man_MANS\s*=)/$1 ev.3 /; - s/^(EXTRA_DIST\s*=)/$1 libev.m4 ev.h ev_vars.h ev_wrap.h event_compat.h ev++.h ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c ev.3 ev.pod ev.html /; + s/^(EXTRA_DIST\s*=)/$1 libev.m4 ev.h ev_vars.h ev_wrap.h event_compat.h ev++.h ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c ev.3 ev.pod /; s/^(include_HEADERS\s*=)/$1 ev.h event_compat.h ev++.h /; s/^(CORE_SRC\s*=)/$1 ev.c /; s/^(SYS_LIBS\s*=)/$1 -lm /; @@ -103,7 +105,8 @@ #s/-Wall/-Wall -Wno-comment -Wunused-function -Wno-unused-value/; s/-Wall//g; #s/libevent/libev/g; - s/AM_INIT_AUTOMAKE\s*\(.*,(.*)\)/AM_INIT_AUTOMAKE(libevent-$1+libev,1.7)/; + #VERSION + s/AM_INIT_AUTOMAKE\s*\(.*,(.*)\)/AM_INIT_AUTOMAKE(libevent-$1+libev,2.0)/; s/AC_LIBOBJ\(select\)/: ;/g; s/AC_LIBOBJ\(poll\)/: ;/g; s/AC_LIBOBJ\(kqueue\)/: ;/g;