*** empty log message ***rel-1_85

7 files changed, 63 insertions, 28 deletions

diff --git a/LICENSE b/LICENSE
index 2bb53c1..7fcf4e0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,10 +10,6 @@ met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -25,13 +21,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-NOTE: the core parts of this library are under the so-called 2-clause
-BSD style license, which is compatible with this one, but lacks the
-restriction that you must not use the name of the author(s) of those parts
-to endorse any product. So feel free to use the authors name and any
-others that helped write the core parts :)
-
-Additionally, if you embed libev, care has been taken that all embeddable
-parts are under the 2-clause BSD license as well.
-
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..581d51f
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+VERSION_INFO = 1:0
+
+EXTRA_DIST = LICENSE libev.m4 autogen.sh \
+	     ev.h ev_vars.h ev_wrap.h event_compat.h ev++.h event.h \
+	     ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c \
+	     ev.3 ev.pod
+
+man_MANS = ev.3
+
+include_HEADERS = ev.h event_compat.h ev++.h event.h
+
+lib_LTLIBRARIES = libev.la
+
+libev_la_SOURCES = ev.c event.c
+libev_la_LDFLAGS = -version-info $(VERSION_INFO)
+
diff --git a/README b/README
index 1585243..c614ed4 100644
--- a/README
+++ b/README
@@ -3,24 +3,29 @@ libev is a high-performance event loop/event model with lots of features.
 
    Homepage: http://software.schmorp.de/pkg/libev
    E-Mail: libev@lists.schmorp.de
+   Library Documentation: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod
 
-   It is modelled (very losely) after libevent
-   (http://monkey.org/~provos/libevent/) and the Event perl module, but aims
-   to be faster and more correct, and also more featureful.
+   It is modelled (very losely) after libevent and the Event perl module,
+   but aims to be faster and more correct, and also more featureful. And
+   also smaller. Yay.
 
 ABOUT THIS DISTRIBUTION
 
-   If you downloaded a distribution of libev, you will find it looks
-   very much like libevent. In fact, the distributed libev tarballs are
-   indeed libevent tarballs patched up with the libev event core, taking
-   the evbuffer, evtag, evdns and evhttpd parts from libevent (they use
-   the libevent emulation inside libev). Configure and Makefile stuff is
-   also a more or less direct copy of libevent, and are maintained by the
-   libevent authors.
+   If you downloaded the libevent+libev distribution of libev, you will
+   find it looks very much like libevent. In fact, the distributed libev
+   tarballs are indeed libevent tarballs patched up with the libev
+   event core, taking the evbuffer, evtag, evdns and evhttpd parts from
+   libevent (they use the libevent emulation inside libev). Configure and
+   Makefile stuff is also a more or less direct copy of libevent, and are
+   maintained by the libevent authors.
+
+   If you downloaded the libev distribution (without libevent), then
+   you only get the core parts of the library, meaning http and dns
+   client/server code and similar things are missing. Only the core event
+   loop is included.
 
    If you are looking for an easily embeddable version, I recommend using
-   the CVS repository (linked from the homepage, above), which contains
-   only the libev core parts.
+   the libev standalone distribution or the CVS repository.
 
    Examples of programs that embed libev: the EV perl module,
    rxvt-unicode, gvpe (GNU Virtual Private Ethernet) and deliantra
diff --git a/autogen.sh b/autogen.sh
new file mode 100644
index 0000000..371b4cd
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+libtoolize --force
+automake --add-missing
+autoreconf
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..13e627e
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,17 @@
+AC_INIT(ev_epoll.c)
+
+AM_INIT_AUTOMAKE(libev,1.85)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+if test "x$GCC" = xyes ; then
+  CFLAGS="$CFLAGS -O3"
+fi
+
+m4_include([libev.m4])
+
+AC_OUTPUT(Makefile)
diff --git a/ev.h b/ev.h
index 635463c..66bfde8 100644
--- a/ev.h
+++ b/ev.h
@@ -120,7 +120,7 @@ struct ev_loop;
 # define EV_PROTOTYPES 1
 #endif
 
-#define EV_VERSION_MAJOR 2
+#define EV_VERSION_MAJOR 1
 #define EV_VERSION_MINOR 0
 
 #ifndef EV_CB_DECLARE
diff --git a/import_libevent b/import_libevent
index 257e277..9f4e35d 100755
--- a/import_libevent
+++ b/import_libevent
@@ -10,6 +10,9 @@ fi
 cvs update -AdP libev
 rsync -avP libev/. . --exclude CVS
 
+rm -f configure.ac
+mv LICENSE.libevent LICENSE
+
 LE=../libevent-1.4.0-beta
 
 cp $LE/evdns.h .
@@ -91,7 +94,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 /;
+   s/^(EXTRA_DIST\s*=)/$1 LICENSE 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 /;