Use #if !EV_MULTIPLICITY instead of #ifndef because it should be defined always.

[software/libev.git] / import_libevent

diff --git a/import_libevent b/import_libevent
index 64898f19bc16c2c61e3877c5a4f31718a7dc9355..b6f54a6a465e93fdd53ddb59c277fdeb8957eea5 100755 (executable)
--- a/import_libevent
+++ b/import_libevent
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LE=../libevent-1.4.0-beta
+
 if ! [ -e evbuffer.c ]; then
    echo do not run this programm unless you know what you are doing
    exit 1
@@ -7,13 +9,15 @@ fi
 
 # this program combines libev and libevent into a single package
 
-cvs update -AdP
+cvs update -AdP libev
 rsync -avP libev/. . --exclude CVS
 
-LE=../libevent-1.4.0-beta
+rm -f configure.ac
 
 cp $LE/evdns.h .
 
+perl -i -pe 's%^/.libevent-include./%#include "event_compat.h"%' event.h
+
 perl -ne '
    s/\s+char buf\[64\];/\tchar buf[96];/;
    if (/#include "event.h"/) {
@@ -91,7 +95,7 @@ perl -ne '
    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 +107,8 @@ perl -ne '
    #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.01)/;
    s/AC_LIBOBJ\(select\)/: ;/g;
    s/AC_LIBOBJ\(poll\)/: ;/g;
    s/AC_LIBOBJ\(kqueue\)/: ;/g;