Revert "Implement tox_loop"

This reverts commit 5ff099763b1f56414572e1c12eb2f003117db5a0.

1 files changed, 0 insertions, 251 deletions

diff --git a/configure.ac b/configure.ac
index 18bc9234..9eaa840f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,6 @@ LIBCHECK_FOUND="no"
 WANT_NACL="no"
 ADD_NACL_OBJECTS_TO_PKGCONFIG="yes"
 SET_SO_VERSION="yes"
-WANT_LIBEV="no"
-WANT_LIBEVENT="no"
 
 AC_ARG_ENABLE([soname-versions],
     [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ],
@@ -57,32 +55,6 @@ AC_ARG_ENABLE([nacl],
     ]
 )
 
-AC_ARG_ENABLE([libev],
-    [AC_HELP_STRING([--enable-libev], [use libev to watch for events (default: disabled)]) ],
-    [
-        if test "x$enableval" = "xyes"; then
-            WANT_LIBEV="yes"
-        elif test "x$enableval" = "xno"; then
-            WANT_LIBEV="no"
-        fi
-    ]
-)
-
-AC_ARG_ENABLE([libevent],
-    [AC_HELP_STRING([--enable-libevent], [use libevent to watch for events (default: disabled)]) ],
-    [
-        if test "x$enableval" = "xyes"; then
-            WANT_LIBEVENT="yes"
-        elif test "x$enableval" = "xno"; then
-            WANT_LIBEVENT="no"
-        fi
-    ]
-)
-
-if test "x$WANT_LIBEV" = "xyes" && test "x$WANT_LIBEVENT" = "xyes"; then
-    AC_MSG_ERROR([cannot enable both libev and libevent, please choose one])
-fi
-
 AC_ARG_ENABLE([randombytes-stir],
     [AC_HELP_STRING([--enable-randombytes-stir], [use randombytes_stir() instead of sodium_init() for faster startup on android (default: disabled)]) ],
     [
@@ -239,10 +211,6 @@ LIBSODIUM_SEARCH_HEADERS=
 LIBSODIUM_SEARCH_LIBS=
 NACL_SEARCH_HEADERS=
 NACL_SEARCH_LIBS=
-LIBEV_SEARCH_HEADERS=
-LIBEV_SEARCH_LIBS=
-LIBEVENT_SEARCH_HEADERS=
-LIBEVENT_SEARCH_LIBS=
 
 AC_ARG_WITH(dependency-search,
     AC_HELP_STRING([--with-dependency-search=DIR],
@@ -296,42 +264,6 @@ AC_ARG_WITH(libsodium-libs,
         ]
 )
 
-AC_ARG_WITH(libev-headers,
-        AC_HELP_STRING([--with-libev-headers=DIR],
-                       [search for libev header files in DIR]),
-        [
-            LIBEV_SEARCH_HEADERS="$withval"
-            AC_MSG_NOTICE([will search for libev header files in $withval])
-        ]
-)
-
-AC_ARG_WITH(libev-libs,
-        AC_HELP_STRING([--with-libev-libs=DIR],
-                       [search for libev libraries in DIR]),
-        [
-            LIBEV_SEARCH_LIBS="$withval"
-            AC_MSG_NOTICE([will search for libev libraries in $withval])
-        ]
-)
-
-AC_ARG_WITH(libevent-headers,
-        AC_HELP_STRING([--with-libevent-headers=DIR],
-                       [search for libevent header files in DIR]),
-        [
-            LIBEVENT_SEARCH_HEADERS="$withval"
-            AC_MSG_NOTICE([will search for libevent header files in $withval])
-        ]
-)
-
-AC_ARG_WITH(libevent-libs,
-        AC_HELP_STRING([--with-libevent-libs=DIR],
-                       [search for libevent libraries in DIR]),
-        [
-            LIBEVENT_SEARCH_LIBS="$withval"
-            AC_MSG_NOTICE([will search for libevent libraries in $withval])
-        ]
-)
-
 if test "x$WANT_NACL" = "xyes"; then
     enable_shared=no
     enable_static=yes
@@ -462,123 +394,6 @@ elif test "x$LIBSODIUM_FOUND" = "xno"; then
     AC_SUBST(LIBSODIUM_LDFLAGS)
 fi
 
-if test "x$WANT_LIBEV" = "xyes"; then
-    if test -n "$PKG_CONFIG"; then
-        PKG_CHECK_MODULES([LIBEV], [libev],
-            [
-                LIBEV_PKG_CONFIG="yes"
-            ],
-            [
-                LIBEV_PKG_CONFIG="no"
-            ]
-        )
-    else
-        LIBEV_PKG_CONFIG="no"
-    fi
-
-    if test "x$LIBEV_PKG_CONFIG" = "xno"; then
-        LIBEV_LIBS=
-        LIBEV_LDFLAGS=
-        LDFLAGS_SAVE="$LDFLAGS"
-
-        if test -n "$LIBEV_SEARCH_LIBS"; then
-            LDFLAGS="-L$LIBEV_SEARCH_LIBS $LDFLAGS"
-            AC_CHECK_LIB(ev, ev_run,
-                [
-                    LIBEV_LDFLAGS="-L$LIBEV_SEARCH_LIBS"
-                    LIBEV_LIBS="-lev"
-                ],
-                [
-                    AC_MSG_ERROR([required library libev was not found in requested location $LIBEV_SEARCH_LIBS])
-                ]
-            )
-        else
-            AC_CHECK_LIB(ev, ev_run,
-                [
-                    LIBEV_LIBS="-lev"
-                ],
-                [
-                    AC_MSG_ERROR([required library libev was not found in requested location $LIBEV_SEARCH_LIBS])
-                ]
-            )
-        fi
-
-        LDFLAGS="$LDFLAGS_SAVE"
-    fi
-
-    AC_SUBST(LIBEV_LIBS)
-    AC_SUBST(LIBEV_LDFLAGS)
-    AC_DEFINE([HAVE_LIBEV], [1], [Define to 1 if you have the 'libev' library (-lev).])
-fi
-
-if test "x$WANT_LIBEVENT" = "xyes"; then
-    if test -n "$PKG_CONFIG"; then
-        if test "x$WIN32" = "xno"; then
-            PKG_CHECK_MODULES([LIBEVENT], [libevent_pthreads],
-                [
-                    LIBEVENT_PKG_CONFIG="yes"
-                ],
-                [
-                    LIBEVENT_PKG_CONFIG="no"
-                ],
-            )
-        else
-            PKG_CHECK_MODULES([LIBEVENT], [libevent],
-                [
-                    LIBEVENT_PKG_CONFIG="yes"
-                ],
-                [
-                    LIBEVENT_PKG_CONFIG="no"
-                ],
-            )
-        fi
-    else
-        LIBEVENT_PKG_CONFIG="no"
-    fi
-
-    if test "x$LIBEVENT_PKG_CONFIG" = "xno"; then
-        LIBEVENT_LIBS=
-        LIBEVENT_LDFLAGS=
-        LDFLAGS_SAVE="$LDFLAGS"
-
-        if test -n "$LIBEVENT_SEARCH_LIBS"; then
-            LDFLAGS="-L$LIBEVENT_SEARCH_LIBS $LDFLAGS"
-            AC_CHECK_LIB(event, event_base_loop,
-                [
-                    LIBEVENT_LDFLAGS="-L$LIBEVENT_SEARCH_LIBS"
-                    if test "x$WIN32" = "xno"; then
-                        LIBEVENT_LIBS="-levent -levent_pthreads"
-                    else
-                        LIBEVENT_LIBS="-levent"
-                    fi
-                ],
-                [
-                    AC_MSG_ERROR([required library libevent was not found in requested location $LIBEVENT_SEARCH_LIBS])
-                ]
-            )
-        else
-            AC_CHECK_LIB(event, event_base_loop,
-                [
-                    if test "x$WIN32" = "xno"; then
-                        LIBEVENT_LIBS="-levent -levent_pthreads"
-                    else
-                        LIBEVENT_LIBS="-levent"
-                    fi
-                ],
-                [
-                    AC_MSG_ERROR([required library libevent was not found in requested location $LIBEVENT_SEARCH_LIBS])
-                ]
-            )
-        fi
-
-        LDFLAGS="$LDFLAGS_SAVE"
-    fi
-
-    AC_SUBST(LIBEVENT_LIBS)
-    AC_SUBST(LIBEVENT_LDFLAGS)
-    AC_DEFINE([HAVE_LIBEVENT], [1], [Define to 1 if you have the 'libevent' library (-levent).])
-fi
-
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -638,72 +453,6 @@ elif test "x$LIBSODIUM_FOUND" = "xno"; then
     AC_SUBST(LIBSODIUM_CFLAGS)
 fi
 
-if test "x$WANT_LIBEV" = "xyes"; then
-    if test "x$LIBEV_PKG_CONFIG" = "xno"; then
-        LIBEV_CFLAGS=
-        CFLAGS_SAVE="$CFLAGS"
-        CPPFLAGS_SAVE="$CPPFLAGS"
-
-        if test -n "$LIBEV_SEARCH_HEADERS"; then
-            CFLAGS="-I$LIBEV_SEARCH_HEADERS $CFLAGS"
-            CPPFLAGS="-I$LIBEV_SEARCH_HEADERS $CPPFLAGS"
-            AC_CHECK_HEADER(ev.h,
-                [
-                    LIBEV_CFLAGS="-I$LIBEV_SEARCH_HEADERS"
-                ],
-                [
-                    AC_MSG_ERROR([header files for required library libev were not found in requested location $LIBEV_SEARCH_HEADERS])
-                ]
-            )
-        else
-            AC_CHECK_HEADER(ev.h,
-                [],
-                [
-                    AC_MSG_ERROR([header files for required library libev was not found on your system, please check http://libev.schmorp.de/])
-                ]
-            )
-        fi
-
-        CFLAGS="$CFLAGS_SAVE"
-        CPPFLAGS="$CPPFLAGS_SAVE"
-    fi
-
-    AC_SUBST(LIBEV_CFLAGS)
-fi
-
-if test "x$WANT_LIBEVENT" = "xyes"; then
-    if test "x$LIBEVENT_PKG_CONFIG" = "xno"; then
-        LIBEVENT_CFLAGS=
-        CFLAGS_SAVE="$CFLAGS"
-        CPPFLAGS_SAVE="$CPPFLAGS"
-
-        if test -n "$LIBEVENT_SEARCH_HEADERS"; then
-            CFLAGS="-I$LIBEVENT_SEARCH_HEADERS $CFLAGS"
-            CPPFLAGS="-I$LIBEVENT_SEARCH_HEADERS $CPPFLAGS"
-            AC_CHECK_HEADERS([event2/event.h event2/thread.h],
-                [
-                    LIBEVENT_CFLAGS="-I$LIBEVENT_SEARCH_HEADERS"
-                ],
-                [
-                    AC_MSG_ERROR([header files for required library libevent were not found in requested location $LIBEVENT_SEARCH_HEADERS])
-                ]
-            )
-        else
-            AC_CHECK_HEADERS([event2/event.h event2/thread.h],
-                [],
-                [
-                    AC_MSG_ERROR([header files for required library libevent was not found on your system, please check http://libevent.org/])
-                ]
-            )
-        fi
-
-        CFLAGS="$CFLAGS_SAVE"
-        CPPFLAGS="$CPPFLAGS_SAVE"
-    fi
-
-    AC_SUBST(LIBEVENT_CFLAGS)
-fi
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_TYPE_INT16_T