fix some aliasing issues again

[software/libev.git] / import_libevent

diff --git a/import_libevent b/import_libevent
index bee54d9bc0a0b68ab17a7e410a5aab521e1bda5e..e7322d70fa7a4d77c136d68782fa8d6535981a65 100755 (executable)
--- a/import_libevent
+++ b/import_libevent
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+if ! [ -e evbuffer.c ]; then
+   echo do not run this programm unless you know what you are doing
+   exit 1
+fi
+
+# this program combines libev and libevent into a single package
+
+cvs update -AdP libev
+rsync -avP libev/. . --exclude CVS
+
 LE=../libevent-1.4.0-beta
 
 cp $LE/evdns.h .
@@ -43,15 +53,15 @@ cp $LE/log.c .
 cp $LE/log.h .
 cp $LE/strlcpy.c .
 rsync -a $LE/WIN32* $LE/sample $LE/test $LE/compat . --del
-rename 's/libevent/libev/' WIN32-Prj/lib*
+#rename 's/libevent/libev/' WIN32-Prj/lib*
 cp $LE/aclocal.m4 .
 #cp $LE/acconfig.h .
 cp $LE/config.h.in .
 cp $LE/event_rpcgen.py .
 cp $LE/*.3 .
 
-perl -i -pe 's/libevent/libev/g' sample/Makefile.am
-perl -i -pe 's/libevent/libev/g' test/Makefile.am
+#perl -i -pe 's/libevent/libev/g' sample/Makefile.am
+#perl -i -pe 's/libevent/libev/g' test/Makefile.am
 
 perl -i -pe 's/#include <event.h>$/#include "event.h"/' test/*.c
 
@@ -85,14 +95,15 @@ perl -ne '
    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 /;
-   s/libevent/libev/g;
+   #s/libevent/libev/g;
    print;
 ' <$LE/Makefile.am >Makefile.am
 
 perl -ne '
    #s/-Wall/-Wall -Wno-comment -Wunused-function -Wno-unused-value/;
    s/-Wall//g;
-   s/libevent/libev/g;
+   #s/libevent/libev/g;
+   s/AM_INIT_AUTOMAKE\s*\(.*,(.*)\)/AM_INIT_AUTOMAKE(libevent-$1+libev,1.8)/;
    s/AC_LIBOBJ\(select\)/: ;/g;
    s/AC_LIBOBJ\(poll\)/: ;/g;
    s/AC_LIBOBJ\(kqueue\)/: ;/g;