Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tevent support #29

Merged
merged 2 commits into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions .autotools

This file was deleted.

7 changes: 0 additions & 7 deletions .checkstyle

This file was deleted.

580 changes: 0 additions & 580 deletions .cproject

This file was deleted.

72 changes: 0 additions & 72 deletions .project

This file was deleted.

1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Nathaniel McCallum <npmccallum@redhat.com>
Robbie Harwood <rharwood@redhat.com>
42 changes: 1 addition & 41 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,41 +1 @@
2012-08-25 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.5 ==
* fix libev's set_flags() implementation
* add AIX dlopen() support
* export symbols based on symbol list files
* add support for building in a static module
* add support for specifying default module

2012-02-09 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.4 ==
* add verto_set_flags()

2012-02-08 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.3 ==
* add external allocator support
* add extern "C" to all headers
* support getting fd state in callbacks
* support getting ctx from ev
* add support for auto-closing file descriptors
* fix a bug where we wrote to free'd memory

2011-11-11 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.2 ==
* Remove trailing uses of types starting with _
* Documentation fix

2011-11-10 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.1 ==
* Build system fix for broken 0.2.0 release

2011-11-10 Nathaniel McCallum <npmccallum@redhat.com>
* == Release 0.2.0 ==
* Fix inconsistent verto_default() singleton state
* Give modules unique table names
* Remove signal table verification magic (no longer needed)
* Give verto_reinitialize() an error condition (int return value)
* Add (optional) pthread locking around our global state
* Cleanup the build system arguments

2011-09-30 Nathaniel McCallum <npmccallum@redhat.com>
* Initial release
This file is no longer used; see git history.
4 changes: 0 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,5 @@ if MODULE_LIBEVENT
pkgconfig_DATA += libverto-libevent.pc
endif

if MODULE_TEVENT
pkgconfig_DATA += libverto-tevent.pc
endif

ACLOCAL_AMFLAGS=-I m4
SUBDIRS=src tests
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sample NEWS file for libverto project.
This file is not used; see git history.
39 changes: 0 additions & 39 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -80,37 +80,20 @@ AC_ARG_WITH([libevent],
*) WITH_LIBEVENT=auto;;
esac], [WITH_LIBEVENT=auto])

AC_ARG_WITH([tevent],
[AS_HELP_STRING([--with-tevent],
[build the tevent library @<:@default: automatic@:>@])],
[case $withval in
no) WITH_TEVENT=no;;
yes) WITH_TEVENT=yes;;
*) WITH_TEVENT=auto;;
esac], [WITH_TEVENT=auto])

# Ensure that if a builtin is chosen only one is built
BUILTIN_MODULE=
if test x$WITH_GLIB == xbuiltin; then
BUILTIN_MODULE=glib
WITH_LIBEV=no
WITH_LIBEVENT=no
WITH_TEVENT=no
elif test x$WITH_LIBEV == xbuiltin; then
BUILTIN_MODULE=libev
WITH_LIBGLIB=no
WITH_LIBEVENT=no
WITH_TEVENT=no
elif test x$WITH_LIBEVENT == xbuiltin; then
BUILTIN_MODULE=libevent
WITH_LIBGLIB=no
WITH_LIBEV=no
WITH_TEVENT=no
elif test x$WITH_TEVENT == xbuiltin; then
BUILTIN_MODULE=tevent
WITH_GLIB=no
WITH_LIBEV=no
WITH_LIBEVENT=no
fi
AC_SUBST([BUILTIN_MODULE], $BUILTIN_MODULE)
if test x$BUILTIN_MODULE != x; then
Expand All @@ -122,31 +105,21 @@ if test x$WITH_GLIB == xdefault; then
AC_DEFINE([DEFUALT_MODULE], [glib])
test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
fi
if test x$WITH_LIBEV == xdefault; then
AC_DEFINE([DEFUALT_MODULE], [libev])
test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes
test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
fi
if test x$WITH_LIBEVENT == xdefault; then
AC_DEFINE([DEFUALT_MODULE], [libevent])
test x$WITH_GLIB == xdefault && WITH_GLIB=yes
test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
fi
if test x$WITH_TEVENT == xdefault; then
AC_DEFINE([DEFUALT_MODULE], [tevent])
test x$WITH_GLIB == xdefault && WITH_GLIB=yes
test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
fi

BUILD_GLIB=no
BUILD_LIBEV=no
BUILD_LIBEVENT=no
BUILD_TEVENT=no

if test x$WITH_GLIB != xno; then
PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],
Expand Down Expand Up @@ -178,30 +151,19 @@ if test x$WITH_LIBEVENT != xno; then
fi
fi

if test x$WITH_TEVENT != xno; then
PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT],
[test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")])
if test x$BUILD_TEVENT == xauto; then
BUILD_TEVENT=yes
fi
fi

AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno])
AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno])
AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno])
AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno])
AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib])
AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev])
AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent])
AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent])

AC_MSG_NOTICE()
AC_MSG_NOTICE([BUILD CONFIGURATION])
AC_MSG_NOTICE(AS_HELP_STRING([pthread], [$BUILD_PTHREAD]))
AC_MSG_NOTICE(AS_HELP_STRING([glib], [$BUILD_GLIB]))
AC_MSG_NOTICE(AS_HELP_STRING([libev], [$BUILD_LIBEV]))
AC_MSG_NOTICE(AS_HELP_STRING([libevent], [$BUILD_LIBEVENT]))
AC_MSG_NOTICE(AS_HELP_STRING([tevent], [$BUILD_TEVENT]))
AC_MSG_NOTICE()

AC_CONFIG_FILES(Makefile
Expand All @@ -210,6 +172,5 @@ AC_CONFIG_FILES(Makefile
libverto-glib.pc
libverto-libev.pc
libverto-libevent.pc
libverto-tevent.pc
libverto.pc)
AC_OUTPUT
11 changes: 0 additions & 11 deletions libverto-tevent.pc.in

This file was deleted.

16 changes: 1 addition & 15 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AM_CFLAGS = -Wall -Wdeclaration-after-statement
AM_LDFLAGS = -version-info 1:0:0
EXTRA_DIST = libverto.symbols libverto-glib.symbols libverto-libev.symbols \
libverto-libevent.symbols libverto-tevent.symbols
libverto-libevent.symbols

include_HEADERS = verto.h verto-module.h
noinst_HEADERS = module.h
Expand All @@ -24,10 +24,6 @@ if BUILTIN_LIBEVENT
libverto_la_SOURCES += verto-libevent.c
endif

if BUILTIN_TEVENT
libverto_la_SOURCES += verto-tevent.c
endif

if MODULE_GLIB
lib_LTLIBRARIES += libverto-glib.la
include_HEADERS += verto-glib.h
Expand Down Expand Up @@ -57,13 +53,3 @@ libverto_libevent_la_CFLAGS = $(AM_CFLAGS) $(libevent_CFLAGS)
libverto_libevent_la_LDFLAGS = $(AM_LDFLAGS) $(libevent_LIBS) \
-export-symbols $(srcdir)/libverto-libevent.symbols
endif

if MODULE_TEVENT
lib_LTLIBRARIES += libverto-tevent.la
include_HEADERS += verto-tevent.h
libverto_tevent_la_SOURCES = verto-tevent.c
libverto_tevent_la_LIBADD = libverto.la
libverto_tevent_la_CFLAGS = $(AM_CFLAGS) $(tevent_CFLAGS)
libverto_tevent_la_LDFLAGS = $(AM_LDFLAGS) $(tevent_LIBS) \
-export-symbols $(srcdir)/libverto-tevent.symbols
endif
4 changes: 0 additions & 4 deletions src/libverto-tevent.symbols

This file was deleted.

Loading