[chunkd patch 1/2] eradicate last vestiges of libevent

[chunkd patch 1/2] eradicate last vestiges of libevent

[Pete Zaitcev]

We stopped using libevent in Chunk a while ago, but for some reason
not all references were removed. I tested this patch by building
on a fresh Fedora 13 system without libevent.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

---
 configure.ac       |    3 ---
 pkg/chunkd.spec    |    2 +-
 server/Makefile.am |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd142e8..5afea93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,6 @@ dnl Checks for required libraries
 dnl -----------------------------
 AC_CHECK_LIB(crypto, MD5_Init, CRYPTO_LIBS=-lcrypto)
 AC_CHECK_LIB(ssl, SSL_new, SSL_LIBS=-lssl)
-AC_CHECK_LIB(event, event_base_new, EVENT_LIBS=-levent,
-   [AC_MSG_ERROR([Missing required libevent])])
 AC_SEARCH_LIBS(argp_parse, argp)
 AC_SEARCH_LIBS(bind, socket)
 PKG_CHECK_MODULES(CLDC, libcldc)
@@ -119,7 +117,6 @@ AM_PATH_XML2(2.6.0, , exit 1)
 
 AC_SUBST(CRYPTO_LIBS)
 AC_SUBST(SSL_LIBS)
-AC_SUBST(EVENT_LIBS)
 
 AC_CONFIG_FILES([doc/Makefile
 		 lib/Makefile
diff --git a/pkg/chunkd.spec b/pkg/chunkd.spec
index 7de0f1d..032f184 100644
--- a/pkg/chunkd.spec
+++ b/pkg/chunkd.spec
@@ -15,7 +15,7 @@ Source3:	chunkd.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # N.B. We need cld to build, because our "make check" spawns a private copy.
-BuildRequires:	libevent-devel glib2-devel openssl-devel zlib-devel
+BuildRequires:	glib2-devel openssl-devel zlib-devel
 BuildRequires:	libxml2-devel procps tokyocabinet-devel
 BuildRequires:	cld >= 0.2.1
 BuildRequires:	cld-devel >= 0.2.1
diff --git a/server/Makefile.am b/server/Makefile.am
index f2a66a1..9ab26fc 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -10,4 +10,4 @@ chunkd_SOURCES	= chunkd.h		\
 		  objcache.c
 chunkd_LDADD	= \
 		  @CLDC_LIBS@ @GLIB_LIBS@ @CRYPTO_LIBS@ \
-		  @SSL_LIBS@ @EVENT_LIBS@ @TOKYOCABINET_LIBS@
+		  @SSL_LIBS@ @TOKYOCABINET_LIBS@

Re: [chunkd patch 1/2] eradicate last vestiges of libevent

[Jeff Garzik]

On 05/01/2010 12:51 AM, Pete Zaitcev wrote:
> We stopped using libevent in Chunk a while ago, but for some reason
> not all references were removed. I tested this patch by building
> on a fresh Fedora 13 system without libevent.
>
> Signed-off-by: Pete Zaitcev<zaitcev@redhat.com>
>
> ---
>   configure.ac       |    3 ---
>   pkg/chunkd.spec    |    2 +-
>   server/Makefile.am |    2 +-
>   3 files changed, 2 insertions(+), 5 deletions(-)

applied 1-2

Thanks for updating the email subject lines.

	Jeff